diff options
| author | Philipp Krones <hello@philkrones.com> | 2025-03-23 12:15:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-23 12:15:07 +0000 |
| commit | e9aed8764e2055eab34564b591a6fbd3d786b718 (patch) | |
| tree | 0e2e3079fdbed16c3795de486ef3f8f6ccc2717f | |
| parent | 07e7414fb11bc6b3a304129f1698bee6a92eb197 (diff) | |
| parent | 3786c07463bc777b310de71adef9d3e75196ea09 (diff) | |
| download | rust-e9aed8764e2055eab34564b591a6fbd3d786b718.tar.gz rust-e9aed8764e2055eab34564b591a6fbd3d786b718.zip | |
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](https://github.com/rust-lang/rust-clippy/commit/c4187145180effa06c87295e44bdf135128866fe) was successful, but the deployment for [this commit](https://github.com/rust-lang/rust-clippy/commit/0a141ab7b882387528eac4140df67e9938e5d257) that was pushed to `main` immediately afterward failed. (edit: the latter deployment seems to be rerun)) changelog: none r? flip1995
| -rw-r--r-- | .github/workflows/deploy.yml | 4 | ||||
| -rw-r--r-- | book/src/development/infrastructure/release.md | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b42f3e7712f..ede19c11257 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,6 +8,10 @@ on: tags: - rust-1.** +concurrency: + group: ${{ github.workflow }} + cancel-in-progress: false + env: TARGET_BRANCH: 'gh-pages' SHA: '${{ github.sha }}' diff --git a/book/src/development/infrastructure/release.md b/book/src/development/infrastructure/release.md index 8b080c099b8..a429e0d953c 100644 --- a/book/src/development/infrastructure/release.md +++ b/book/src/development/infrastructure/release.md @@ -88,9 +88,6 @@ git push upstream stable After updating the `stable` branch, tag the HEAD commit and push it to the Clippy repo. -> Note: Only push the tag once the Deploy GitHub action of the `beta` branch is -> finished. Otherwise the deploy for the tag might fail. - ```bash git tag rust-1.XX.0 # XX should be exchanged with the corresponding version git push upstream rust-1.XX.0 # `upstream` is the `rust-lang/rust-clippy` remote |