Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coverage-report now uses less restricted file-names #470

Merged
merged 4 commits into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions .github/workflows/ci_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -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
3 changes: 1 addition & 2 deletions .github/workflows/postprocess.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 0 additions & 19 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading