diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml index 42fc6c18819cb8ea60dc47c3098f5c0d053a8fdd..d55f89cba0ebc2b6c71a889e5b9bad27d4c1c0eb 100644 --- a/.github/workflows/ci_pipeline.yml +++ b/.github/workflows/ci_pipeline.yml @@ -63,17 +63,16 @@ jobs: coverage run -m pytest --continue-on-collection-errors -v --durations=0 pySDC/tests -m ${{ matrix.env }} - name: Make coverage report run: | - mv data data_${{ matrix.python }} coverage combine - mv .coverage coverage_${{ matrix.env }}_${{ matrix.python }}.dat + mv .coverage coverage_${{ matrix.env }}.dat - name: Uploading artifacts uses: actions/upload-artifact@v4 - if: matrix.python == '3.10' + if: matrix.python == '3.12' with: name: test-artifacts-cpu-${{ matrix.env }} path: | - data_3.10 - coverage_${{ matrix.env }}_3.10.dat + data + coverage_${{ matrix.env }}.dat project_cpu_tests_linux: runs-on: ubuntu-latest @@ -120,17 +119,16 @@ jobs: coverage run -m pytest --continue-on-collection-errors -v --durations=0 pySDC/projects/${{ matrix.env }}/tests - name: Make coverage report run: | - mv data data_${{ matrix.python }} coverage combine - mv .coverage coverage_${{ matrix.env }}_${{ matrix.python }}.dat + mv .coverage coverage_${{ matrix.env }}.dat - name: Uploading artifacts uses: actions/upload-artifact@v4 - if: matrix.python == '3.10' + if: matrix.python == '3.12' with: name: test-artifacts-project-${{ matrix.env }} path: | - data_3.10 - coverage_${{ matrix.env }}_3.10.dat + data + coverage_${{ matrix.env }}.dat user_libpressio_tests: runs-on: ubuntu-latest @@ -160,14 +158,14 @@ jobs: mv data data_libpressio coverage combine - mv .coverage coverage_libpressio_3.10.dat + mv .coverage coverage_libpressio.dat - name: Upload artifacts uses: actions/upload-artifact@v4 with: name: test-artifacts-libpressio path: | data_libpressio - coverage_libpressio_3.10.dat + coverage_libpressio.dat user_monodomain_tests_linux: runs-on: ubuntu-latest @@ -182,7 +180,7 @@ jobs: with: environment-file: "pySDC/projects/Monodomain/etc/environment-monodomain.yml" create-args: >- - python=3.10 + python=3.12 - name: Compile C++ ionic models env: IONIC_MODELS_PATH: "pySDC/projects/Monodomain/problem_classes/ionicmodels/cpp" @@ -201,11 +199,11 @@ jobs: run: | mv data data_monodomain coverage combine - mv .coverage coverage_monodomain_3.10.dat + mv .coverage coverage_monodomain.dat - name: Uploading artifacts uses: actions/upload-artifact@v4 with: name: test-artifacts-monodomain path: | data_monodomain - coverage_monodomain_3.10.dat + coverage_monodomain.dat diff --git a/.github/workflows/postprocess.yml b/.github/workflows/postprocess.yml index a7ef5f79ec5ac8dd30d3bca3bf922eda6b384ea2..f3ab464d04880f92f9154e8d724cbad2d609b6ae 100644 --- a/.github/workflows/postprocess.yml +++ b/.github/workflows/postprocess.yml @@ -32,8 +32,7 @@ jobs: github-token: ${{ secrets.ACTION_READ_TOKEN }} - name: Prepare artifacts run: | - cp data_3.10/* data/. - python -m coverage combine coverage_*_3.10.dat + python -m coverage combine coverage_*.dat python -m coverage xml python -m coverage html - name: Generate Coverage badge diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97148dea391a93137ede0aa211b10f680996517e..bd4adb4dd903c3a417f505b226f73735b889d6fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -129,22 +129,3 @@ benchmark: - >- pytest --continue-on-collection-errors -v pySDC/tests -m "benchmark" --benchmark-json=benchmarks/output.json - -# bundle: -# image: mambaorg/micromamba -# stage: upload -# artifacts: -# paths: -# - data -# - coverage.xml -# - benchmarks -# - htmlcov -# before_script: -# - micromamba create --yes -f etc/environment-base.yml -# - eval "$(micromamba shell hook --shell=bash)" -# - micromamba activate pySDC -# script: -# - cp data_3.10/* data/. -# - python -m coverage combine coverage_*_3.10.dat -# - python -m coverage xml -# - python -m coverage html