diff options
| -rw-r--r-- | .github/workflows/unit_tests.yaml | 13 | ||||
| -rw-r--r-- | lib/spack/spack/__init__.py | 1 | ||||
| -rwxr-xr-x | share/spack/qa/run-shell-tests | 6 | ||||
| -rwxr-xr-x | share/spack/qa/run-unit-tests | 7 |
4 files changed, 21 insertions, 6 deletions
diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index c386975778..b924362a25 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -180,7 +180,7 @@ jobs: SPACK_TEST_SOLVER: ${{ matrix.concretizer }} run: | share/spack/qa/run-unit-tests - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v2.0.2 if: ${{ needs.changes.outputs.with_coverage == 'true' }} with: flags: unittests,linux,${{ matrix.concretizer }} @@ -232,7 +232,7 @@ jobs: COVERAGE: true run: | share/spack/qa/run-shell-tests - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v2.0.2 if: ${{ needs.changes.outputs.with_coverage == 'true' }} with: flags: shelltests,linux @@ -348,7 +348,7 @@ jobs: SPACK_TEST_SOLVER: clingo run: | share/spack/qa/run-unit-tests - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v2.0.2 if: ${{ needs.changes.outputs.with_coverage == 'true' }} with: flags: unittests,linux,clingo @@ -384,12 +384,15 @@ jobs: coverage run $(which spack) unit-test -x coverage combine coverage xml + # Delete the symlink going from ./lib/spack/docs/_spack_root back to + # the initial directory, since it causes ELOOP errors with codecov/actions@2 + rm lib/spack/docs/_spack_root else echo "ONLY PACKAGE RECIPES CHANGED [skipping coverage]" $(which spack) unit-test -x -m "not maybeslow" -k "package_sanity" fi - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v2.0.2 if: ${{ needs.changes.outputs.with_coverage == 'true' }} with: - file: ./coverage.xml + files: ./coverage.xml flags: unittests,macos diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index a17fc1dfc1..1b14a7d5ff 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -3,7 +3,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - #: major, minor, patch version for Spack, in a tuple spack_version_info = (0, 16, 1) diff --git a/share/spack/qa/run-shell-tests b/share/spack/qa/run-shell-tests index 83838ff5ef..22bf4b8aba 100755 --- a/share/spack/qa/run-shell-tests +++ b/share/spack/qa/run-shell-tests @@ -56,3 +56,9 @@ fish "$QA_DIR/setup-env-test.fish" # run csh and tcsh tests csh "$QA_DIR/setup-env-test.csh" tcsh "$QA_DIR/setup-env-test.csh" + +# Delete the symlink going from ./lib/spack/docs/_spack_root back to +# the initial directory, since it causes ELOOP errors with codecov/actions@2 +if [[ "$COVERAGE" == "true" ]]; then + rm lib/spack/docs/_spack_root +fi diff --git a/share/spack/qa/run-unit-tests b/share/spack/qa/run-unit-tests index 8384edee0c..935b1905d1 100755 --- a/share/spack/qa/run-unit-tests +++ b/share/spack/qa/run-unit-tests @@ -48,3 +48,10 @@ if [[ "$ONLY_PACKAGES" == "true" ]]; then fi $coverage_run $(which spack) unit-test -x --verbose + +# Delete the symlink going from ./lib/spack/docs/_spack_root back to +# the initial directory, since it causes ELOOP errors with codecov/actions@2 +if [[ "$COVERAGE" == "true" ]]; then + rm lib/spack/docs/_spack_root +fi + |