diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2021-02-05 12:04:54 +0100 |
|---|---|---|
| committer | Mara Bos <m-ou.se@m-ou.se> | 2021-02-05 12:18:25 +0100 |
| commit | dabf0fdce6be7cab7372f5b171c3f5b569d6b92e (patch) | |
| tree | 065c18fc0ce5d9c938ad6a1bbf7338a5211bb552 | |
| parent | 573f1c059fe290d719fc444e3a3316f6954af578 (diff) | |
| download | rust-fix-cancel.tar.gz | |
Disable cancel-outdated-builds.fix-cancel
| -rw-r--r-- | .github/workflows/ci.yml | 15 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 12 |
2 files changed, 6 insertions, 21 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f10b6ca7ea9..a23d0818e74 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,11 +72,6 @@ jobs: - name: decide whether to skip this job run: src/ci/scripts/should-skip-this.sh if: success() && !env.SKIP_JOB - - 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 }}" - if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'" - name: collect CPU statistics run: src/ci/scripts/collect-cpu-stats.sh if: success() && !env.SKIP_JOB @@ -433,11 +428,6 @@ jobs: - name: decide whether to skip this job run: src/ci/scripts/should-skip-this.sh if: success() && !env.SKIP_JOB - - 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 }}" - if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'" - name: collect CPU statistics run: src/ci/scripts/collect-cpu-stats.sh if: success() && !env.SKIP_JOB @@ -540,11 +530,6 @@ jobs: - name: decide whether to skip this job run: src/ci/scripts/should-skip-this.sh if: success() && !env.SKIP_JOB - - 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 }}" - if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'" - name: collect CPU statistics run: src/ci/scripts/collect-cpu-stats.sh if: success() && !env.SKIP_JOB diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 9eea6243dfa..7427bf08ddb 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -126,12 +126,12 @@ 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 }}" - if: success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' - <<: *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 }}" + # if: success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' + # <<: *step - name: collect CPU statistics run: src/ci/scripts/collect-cpu-stats.sh |