Skip to content

Commit e9aed87

Browse files
authored
set concurrency for the deploy job (#14448)
In the current GitHub Actions CI/CD setup, the `deploy` job is not triggered when a PR is enqueued in the merge queue but only when it is merged. Since concurrency is not configured for this job, deployments may fail for later PRs if multiple PRs are merged in quick succession. (e.g. the deployment for [this commit](c418714) was successful, but the deployment for [this commit](0a141ab) that was pushed to `main` immediately afterward failed. (edit: the latter deployment seems to be rerun)) changelog: none r? flip1995
2 parents 07e7414 + 3786c07 commit e9aed87

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/deploy.yml

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
tags:
99
- rust-1.**
1010

11+
concurrency:
12+
group: ${{ github.workflow }}
13+
cancel-in-progress: false
14+
1115
env:
1216
TARGET_BRANCH: 'gh-pages'
1317
SHA: '${{ github.sha }}'

book/src/development/infrastructure/release.md

-3
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ git push upstream stable
8888
After updating the `stable` branch, tag the HEAD commit and push it to the
8989
Clippy repo.
9090

91-
> Note: Only push the tag once the Deploy GitHub action of the `beta` branch is
92-
> finished. Otherwise the deploy for the tag might fail.
93-
9491
```bash
9592
git tag rust-1.XX.0 # XX should be exchanged with the corresponding version
9693
git push upstream rust-1.XX.0 # `upstream` is the `rust-lang/rust-clippy` remote

0 commit comments

Comments
 (0)