diff --git a/.github/workflows/pytest_macos.yml b/.github/workflows/pytest_macos.yml index aba92884..398538bf 100644 --- a/.github/workflows/pytest_macos.yml +++ b/.github/workflows/pytest_macos.yml @@ -59,7 +59,7 @@ jobs: pip install pytest-split pip install -r requirements.txt pip install -r dev_requirements.txt - mamba install -c conda-forge svmbir>=0.3.3 + # mamba install -c conda-forge svmbir>=0.3.3 mamba install -c astra-toolbox astra-toolbox mamba install -c conda-forge pyyaml pip install --upgrade --force-reinstall scipy>=1.6.0 # Temporary fix for GLIBCXX_3.4.30 not found in conda forge version diff --git a/.github/workflows/pytest_ubuntu.yml b/.github/workflows/pytest_ubuntu.yml index 5f9cb9c2..31d65367 100644 --- a/.github/workflows/pytest_ubuntu.yml +++ b/.github/workflows/pytest_ubuntu.yml @@ -81,7 +81,7 @@ jobs: pytest -x --cov --level=2 --durations-path=$DURATIONS_FILE --splits=5 --group=${{ matrix.group }} --pyargs scico # Upload coverage data - name: Upload coverage - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: coverage${{ matrix.group }} path: .coverage @@ -107,9 +107,10 @@ jobs: pip install coverage - name: Download all artifacts # Downloads coverage1, coverage2, etc. - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 - name: Run coverage run: | + ls -R coverage combine coverage*/.coverage* coverage report coverage xml