Skip to content

Commit e8973ea

Browse files
committed
Remove cancel-outdated action
1 parent 3c2b8b0 commit e8973ea

File tree

2 files changed

+2
-34
lines changed

2 files changed

+2
-34
lines changed

.github/workflows/ci.yml

-21
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ concurrency:
3535
cancel-in-progress: true
3636
jobs:
3737
pr:
38-
permissions:
39-
actions: write
4038
name: "PR - ${{ matrix.name }}"
4139
env:
4240
CI_JOB_NAME: "${{ matrix.name }}"
@@ -87,11 +85,6 @@ jobs:
8785
- name: ensure the channel matches the target branch
8886
run: src/ci/scripts/verify-channel.sh
8987
if: success() && !env.SKIP_JOB
90-
- name: configure GitHub Actions to kill the build when outdated
91-
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
92-
with:
93-
github_token: "${{ secrets.github_token }}"
94-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && github.ref != 'refs/heads/try-perf'"
9588
- name: collect CPU statistics
9689
run: src/ci/scripts/collect-cpu-stats.sh
9790
if: success() && !env.SKIP_JOB
@@ -165,8 +158,6 @@ jobs:
165158
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
166159
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
167160
auto:
168-
permissions:
169-
actions: write
170161
name: "auto - ${{ matrix.name }}"
171162
env:
172163
CI_JOB_NAME: "${{ matrix.name }}"
@@ -499,11 +490,6 @@ jobs:
499490
- name: ensure the channel matches the target branch
500491
run: src/ci/scripts/verify-channel.sh
501492
if: success() && !env.SKIP_JOB
502-
- name: configure GitHub Actions to kill the build when outdated
503-
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
504-
with:
505-
github_token: "${{ secrets.github_token }}"
506-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && github.ref != 'refs/heads/try-perf'"
507493
- name: collect CPU statistics
508494
run: src/ci/scripts/collect-cpu-stats.sh
509495
if: success() && !env.SKIP_JOB
@@ -577,8 +563,6 @@ jobs:
577563
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
578564
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
579565
try:
580-
permissions:
581-
actions: write
582566
name: "try - ${{ matrix.name }}"
583567
env:
584568
DIST_TRY_BUILD: 1
@@ -626,11 +610,6 @@ jobs:
626610
- name: ensure the channel matches the target branch
627611
run: src/ci/scripts/verify-channel.sh
628612
if: success() && !env.SKIP_JOB
629-
- name: configure GitHub Actions to kill the build when outdated
630-
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
631-
with:
632-
github_token: "${{ secrets.github_token }}"
633-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && github.ref != 'refs/heads/try-perf'"
634613
- name: collect CPU statistics
635614
run: src/ci/scripts/collect-cpu-stats.sh
636615
if: success() && !env.SKIP_JOB

src/ci/github-actions/ci.yml

+2-13
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,6 @@ x--expand-yaml-anchors--remove:
147147
run: src/ci/scripts/verify-channel.sh
148148
<<: *step
149149

150-
- name: configure GitHub Actions to kill the build when outdated
151-
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
152-
with:
153-
github_token: "${{ secrets.github_token }}"
154-
if: success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && github.ref != 'refs/heads/try-perf'
155-
<<: *step
156-
157150
- name: collect CPU statistics
158151
run: src/ci/scripts/collect-cpu-stats.sh
159152
<<: *step
@@ -306,13 +299,13 @@ defaults:
306299
shell: bash
307300

308301
concurrency:
302+
# For a given workflow, if we push to the same PR, cancel all previous builds on that PR.
303+
# If the push is not attached to a PR, we will cancel all builds related to the same commit SHA.
309304
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
310305
cancel-in-progress: true
311306

312307
jobs:
313308
pr:
314-
permissions:
315-
actions: write # for rust-lang/simpleinfra/github-actions/cancel-outdated-builds
316309
<<: *base-ci-job
317310
name: PR - ${{ matrix.name }}
318311
env:
@@ -335,8 +328,6 @@ jobs:
335328
<<: *job-linux-16c
336329

337330
auto:
338-
permissions:
339-
actions: write # for rust-lang/simpleinfra/github-actions/cancel-outdated-builds
340331
<<: *base-ci-job
341332
name: auto - ${{ matrix.name }}
342333
env:
@@ -738,8 +729,6 @@ jobs:
738729
<<: *job-windows-8c
739730

740731
try:
741-
permissions:
742-
actions: write # for rust-lang/simpleinfra/github-actions/cancel-outdated-builds
743732
<<: *base-ci-job
744733
name: try - ${{ matrix.name }}
745734
env:

0 commit comments

Comments
 (0)