diff options
| author | bors <bors@rust-lang.org> | 2020-08-27 23:22:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-27 23:22:34 +0000 |
| commit | 2aa741a9faf8519d3af98aba610677c8d2bc84a5 (patch) | |
| tree | 57813b4f48a6cb0d47a7e4ab79e2b0b6b2f55ecf /src/ci | |
| parent | 397b390cc76ba1d98f80b2a24a371f708dcc9169 (diff) | |
| parent | 19e70bf82265134d988810e4549d3b514211271b (diff) | |
| download | rust-2aa741a9faf8519d3af98aba610677c8d2bc84a5.tar.gz rust-2aa741a9faf8519d3af98aba610677c8d2bc84a5.zip | |
Auto merge of #75995 - pietroalbini:ci-let-fallible-finish, r=Mark-Simulacrum
Disable cancel-outdated-builds for auto-fallible `cancel-outdated-builds` doesn't need to be enabled on fallible jobs, and it's actually making it harder for us to see if https://github.com/rust-lang/rust/issues/71988 is fixed. This adds some temporary code to avoid `auto-fallible` jobs from being cancelled by our tooling. r? @Mark-Simulacrum
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index db2def483ac..05b98d9e149 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -107,7 +107,9 @@ x--expand-yaml-anchors--remove: uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master with: github_token: "${{ secrets.github_token }}" - if: success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' + # TODO: remove the condition on RUST_CI_TEMP_SKIP_CANCEL_OUTDATED once + # we remove the `auto-fallible` job. + if: success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && !env.RUST_CI_TEMP_SKIP_CANCEL_OUTDATED <<: *step # Rust Log Analyzer can't currently detect the PR number of a GitHub @@ -609,6 +611,10 @@ jobs: NO_LLVM_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1 DIST_REQUIRE_ALL_TOOLS: 1 + + # TODO: remove once we move this job away from auto-fallible. + # Also, remove the variable from the cancel-outdated-builds step + RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1 <<: *job-macos-xl - name: dist-x86_64-apple-alt @@ -619,6 +625,10 @@ jobs: MACOSX_DEPLOYMENT_TARGET: 10.7 NO_LLVM_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1 + + # TODO: remove once we move this job away from auto-fallible. + # Also, remove the variable from the cancel-outdated-builds step + RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1 <<: *job-macos-xl - name: x86_64-apple @@ -630,6 +640,10 @@ jobs: MACOSX_STD_DEPLOYMENT_TARGET: 10.7 NO_LLVM_ASSERTIONS: 1 NO_DEBUG_ASSERTIONS: 1 + + # TODO: remove once we move this job away from auto-fallible. + # Also, remove the variable from the cancel-outdated-builds step + RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1 <<: *job-macos-xl master: |