Skip to content

Commit 527a5ae

Browse files
committed
Restore cancellability of long running jobs
1 parent 1292781 commit 527a5ae

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/ci-linux.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
# for tox_system_factors in docker.yml.
6262

6363
standard:
64-
if: always()
64+
if: ${{ success() || failure() }}
6565
uses: ./.github/workflows/docker.yml
6666
with:
6767
tox_packages_factors: >-
@@ -131,7 +131,7 @@ jobs:
131131
max_parallel: 15
132132

133133
minimal:
134-
if: always()
134+
if: ${{ success() || failure() }}
135135
uses: ./.github/workflows/docker.yml
136136
with:
137137
tox_packages_factors: >-
@@ -147,7 +147,7 @@ jobs:
147147
max_parallel: 24
148148

149149
maximal:
150-
if: always()
150+
if: ${{ success() || failure() }}
151151
needs: [minimal]
152152
uses: ./.github/workflows/docker.yml
153153
with:
@@ -162,7 +162,7 @@ jobs:
162162
docker_push_repository: ghcr.io/${{ github.repository }}/
163163

164164
optional:
165-
if: always()
165+
if: ${{ success() || failure() }}
166166
needs: [standard]
167167
uses: ./.github/workflows/docker.yml
168168
with:
@@ -178,7 +178,7 @@ jobs:
178178
logs_artifact_postfix: "-optional"
179179

180180
experimental:
181-
if: always()
181+
if: ${{ success() || failure() }}
182182
needs: [optional]
183183
uses: ./.github/workflows/docker.yml
184184
with:

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,4 +385,4 @@ jobs:
385385
else
386386
echo "No Docker images created."
387387
fi
388-
if: always() && inputs.docker_push_repository
388+
if: ${{ always() && inputs.docker_push_repository }}

0 commit comments

Comments
 (0)