Skip to content

Commit 9d5cd21

Browse files
committed
Auto merge of #100033 - rylev:no-cancel-try-perf, r=Mark-Simulacrum
Don't cancel try-perf branch if 'outdated' `try-perf` just like the `try` branch should always run all jobs to completion. This allows us to use the branch like a queue. r? `@Mark-Simulacrum`
2 parents 21de280 + debb75a commit 9d5cd21

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
8080
with:
8181
github_token: "${{ secrets.github_token }}"
82-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
82+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && github.ref != 'refs/heads/try-perf'"
8383
- name: collect CPU statistics
8484
run: src/ci/scripts/collect-cpu-stats.sh
8585
if: success() && !env.SKIP_JOB
@@ -478,7 +478,7 @@ jobs:
478478
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
479479
with:
480480
github_token: "${{ secrets.github_token }}"
481-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
481+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && github.ref != 'refs/heads/try-perf'"
482482
- name: collect CPU statistics
483483
run: src/ci/scripts/collect-cpu-stats.sh
484484
if: success() && !env.SKIP_JOB
@@ -588,7 +588,7 @@ jobs:
588588
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
589589
with:
590590
github_token: "${{ secrets.github_token }}"
591-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
591+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && github.ref != 'refs/heads/try-perf'"
592592
- name: collect CPU statistics
593593
run: src/ci/scripts/collect-cpu-stats.sh
594594
if: success() && !env.SKIP_JOB

src/ci/github-actions/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ x--expand-yaml-anchors--remove:
134134
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
135135
with:
136136
github_token: "${{ secrets.github_token }}"
137-
if: success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'
137+
if: success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && github.ref != 'refs/heads/try-perf'
138138
<<: *step
139139

140140
- name: collect CPU statistics

0 commit comments

Comments
 (0)