Skip to content

Commit f7edc62

Browse files
committed
ci: add gh-ref to docker name to avoid branch conficts
1 parent b99909a commit f7edc62

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/pytest-gpu.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Build docker image
7676
run: |
77-
docker build . --rm --pull --file docker/Dockerfile.devito --tag ${{ matrix.name }} --build-arg base=${{ matrix.base }}
77+
docker build . --rm --pull --file docker/Dockerfile.devito --tag ${{ matrix.name }}-${{ github.ref }} --build-arg base=${{ matrix.base }}
7878
7979
- name: Remove dangling layers
8080
run: |
@@ -87,13 +87,13 @@ jobs:
8787
docker ps -aq | xargs -r docker rm -f
8888
# Run tests
8989
ci_env=`bash <(curl -s https://codecov.io/env)`
90-
docker run ${{ matrix.flags }} ${{ matrix.name }} ${{ matrix.test_drive_cmd }}
91-
docker run ${{ matrix.flags }} $ci_env -e CI=true ${{ matrix.name }} pytest --cov --cov-config=.coveragerc --cov-report=xml ${{ matrix.test_files }}
90+
docker run ${{ matrix.flags }} ${{ matrix.name }}-${{ github.ref }} ${{ matrix.test_drive_cmd }}
91+
docker run ${{ matrix.flags }} $ci_env -e CI=true ${{ matrix.name }}-${{ github.ref }} pytest --cov --cov-config=.coveragerc --cov-report=xml ${{ matrix.test_files }}
9292
9393
- name: Test examples
9494
run: |
95-
docker run ${{ matrix.flags }} ${{ matrix.name }} pytest ${{ matrix.test_examples }}
95+
docker run ${{ matrix.flags }} ${{ matrix.name }}-${{ github.ref }} pytest ${{ matrix.test_examples }}
9696
9797
- name: Test examples with MPI
9898
run: |
99-
docker run ${{ matrix.flags }} --env DEVITO_MPI=1 ${{ matrix.name }} mpiexec -n 2 pytest ${{ matrix.test_examples }}
99+
docker run ${{ matrix.flags }} --env DEVITO_MPI=1 ${{ matrix.name }}-${{ github.ref }} mpiexec -n 2 pytest ${{ matrix.test_examples }}

0 commit comments

Comments
 (0)