Skip to content

Commit 28bf4cc

Browse files
authored
Merge pull request #2550 from devitocodes/coverage
ci: Fix docker codecov
2 parents b22dd66 + 6e54132 commit 28bf4cc

File tree

12 files changed

+31
-23
lines changed

12 files changed

+31
-23
lines changed

.github/workflows/asv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
# Trigger the workflow on push to the master branch
1717
push:
1818
branches:
19-
- master
19+
- main
2020

2121
jobs:
2222

.github/workflows/docker-devito.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [published]
66
push:
77
branches:
8-
- master # Push events on master branch
8+
- main # Push events on master branch
99

1010
jobs:
1111
deploy-devito:

.github/workflows/examples-mpi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ on:
1616
# but only for the master branch
1717
push:
1818
branches:
19-
- master
19+
- main
2020
pull_request:
2121
branches:
22-
- master
22+
- main
2323

2424
jobs:
2525
build:

.github/workflows/examples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ on:
99
# but only for the master branch
1010
push:
1111
branches:
12-
- master
12+
- main
1313
pull_request:
1414
branches:
15-
- master
15+
- main
1616

1717
jobs:
1818
tutorials:

.github/workflows/flake8.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ on:
99
# but only for the master branch
1010
push:
1111
branches:
12-
- master
12+
- main
1313
pull_request:
1414
branches:
15-
- master
15+
- main
1616

1717
jobs:
1818
flake8:

.github/workflows/pytest-core-mpi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ on:
99
# but only for the master branch
1010
push:
1111
branches:
12-
- master
12+
- main
1313
pull_request:
1414
branches:
15-
- master
15+
- main
1616

1717
jobs:
1818
test-mpi-basic:

.github/workflows/pytest-core-nompi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ on:
99
# but only for the master branch
1010
push:
1111
branches:
12-
- master
12+
- main
1313
pull_request:
1414
branches:
15-
- master
15+
- main
1616

1717
jobs:
1818
pytest:

.github/workflows/pytest-gpu.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ on:
1818
# but only for the master branch
1919
push:
2020
branches:
21-
- master
21+
- main
2222
pull_request:
2323
branches:
24-
- master
24+
- main
2525
# Push-button activation
2626
workflow_dispatch:
2727
inputs:
@@ -77,15 +77,18 @@ jobs:
7777
docker build . --rm --pull --file docker/Dockerfile.devito --tag ${{ matrix.name }} --build-arg base=${{ matrix.base }}
7878
7979
- name: Remove dangling layers
80-
run: docker system prune -f
80+
run: |
81+
docker system prune -f
82+
echo "CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }}" >> $GITHUB_ENV
8183
8284
- name: Test with pytest
8385
run: |
8486
# Remove all existing containers for safety
8587
docker ps -aq | xargs -r docker rm -f
8688
# Run tests
89+
ci_env=`bash <(curl -s https://codecov.io/env)`
8790
docker run ${{ matrix.flags }} ${{ matrix.name }} ${{ matrix.test_drive_cmd }}
88-
docker run ${{ matrix.flags }} -e CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }} ${{ matrix.name }} pytest --cov --cov-config=.coveragerc --cov-report=xml ${{ matrix.test_files }}
91+
docker run ${{ matrix.flags }} $ci_env -e CI=true ${{ matrix.name }} pytest --cov --cov-config=.coveragerc --cov-report=xml ${{ matrix.test_files }}
8992
9093
- name: Test examples
9194
run: |

.github/workflows/release-notes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
# branches to consider in the event; optional, defaults to all
66
branches:
7-
- master
7+
- main
88

99
jobs:
1010
update_release_draft:

.github/workflows/triggers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Master triggers
33
on:
44
push:
55
branches:
6-
- master # Push events on master branch
6+
- main # Push events on master branch
77

88
jobs:
99
build:

0 commit comments

Comments
 (0)