Skip to content

Commit 824dcd4

Browse files
committed
ci: disable cancel-outdated-builds for the try branch
While for auto, try and PR builds we only want the latest commit to be tested, that's not true for try builds: each commit pushed to the branch is a different PR being tested, and we want multiple PRs to be tested in parallel if there is enough demand. Fixes rust-lang#70569
1 parent 75ff311 commit 824dcd4

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
6464
with:
6565
github_token: "${{ secrets.github_token }}"
66-
if: success() && !env.SKIP_JOB
66+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
6767
- name: add extra environment variables
6868
run: src/ci/scripts/setup-environment.sh
6969
env:
@@ -196,7 +196,7 @@ jobs:
196196
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
197197
with:
198198
github_token: "${{ secrets.github_token }}"
199-
if: success() && !env.SKIP_JOB
199+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
200200
- name: add extra environment variables
201201
run: src/ci/scripts/setup-environment.sh
202202
env:
@@ -626,7 +626,7 @@ jobs:
626626
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
627627
with:
628628
github_token: "${{ secrets.github_token }}"
629-
if: success() && !env.SKIP_JOB
629+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
630630
- name: add extra environment variables
631631
run: src/ci/scripts/setup-environment.sh
632632
env:

src/ci/github-actions/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ x--expand-yaml-anchors--remove:
103103
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
104104
with:
105105
github_token: "${{ secrets.github_token }}"
106+
if: success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'
106107
<<: *step
107108

108109
- name: add extra environment variables

0 commit comments

Comments
 (0)