diff options
| author | bors <bors@rust-lang.org> | 2020-08-28 17:14:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-28 17:14:04 +0000 |
| commit | abb98ca10de10e0a80e2bdbb8f704649ceed556f (patch) | |
| tree | 277818e361ae01b76e65ffc2da924bcf1fcf8287 /src/ci/github-actions | |
| parent | 3e3c552605180d739eb6c23bc657121679caa456 (diff) | |
| parent | 19d072f5d42738334c3f421ed2e211f7195b348e (diff) | |
| download | rust-abb98ca10de10e0a80e2bdbb8f704649ceed556f.tar.gz rust-abb98ca10de10e0a80e2bdbb8f704649ceed556f.zip | |
Auto merge of #76018 - pietroalbini:ci-left-fallible-finish-2, r=Mark-Simulacrum
Run cancel-outdated-builds after fully setting up the env This PR fixes #75995 not working as expected. Due to GitHub Actions limitations the environment variables set in the build matrix definition are not added by the GHA runner, but by the `setup-environment.sh` script. Before this PR the `cancel-outdated-builds` action was started before that script, so it was never able to detect the "suppression" variable added in #75995. This PR reorders the jobs to make sure `setup-environment.sh` runs before the action. r? @Mark-Simulacrum
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 05b98d9e149..d5abfe9f9bb 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -103,15 +103,6 @@ x--expand-yaml-anchors--remove: with: fetch-depth: 2 - - name: configure GitHub Actions to kill the build when outdated - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master - with: - github_token: "${{ secrets.github_token }}" - # 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 # Actions build on its own, so a hint in the log message is needed to # point it in the right direction. @@ -135,6 +126,15 @@ x--expand-yaml-anchors--remove: run: src/ci/scripts/should-skip-this.sh <<: *step + - name: configure GitHub Actions to kill the build when outdated + uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master + with: + github_token: "${{ secrets.github_token }}" + # 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 + - name: collect CPU statistics run: src/ci/scripts/collect-cpu-stats.sh <<: *step |