diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2020-03-31 19:46:05 +0200 |
|---|---|---|
| committer | Pietro Albini <pietro@pietroalbini.org> | 2020-03-31 19:49:36 +0200 |
| commit | 824dcd424f4a42f6be61b782cd04e18b09177361 (patch) | |
| tree | e33b7e025e5ea0494a18dacb9dbb814b35329957 | |
| parent | 75ff3110ac6d8a0259023b83fd20d7ab295f8dd6 (diff) | |
ci: disable cancel-outdated-builds for the try branch
While for auto, try and PR builds we only want the latest commit to be tested, that's not true for try builds: each commit pushed to the branch is a different PR being tested, and we want multiple PRs to be tested in parallel if there is enough demand. Fixes #70569
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1261f04b82..fd3da15a21b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,7 @@ jobs: uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master with: github_token: "${{ secrets.github_token }}" - if: success() && !env.SKIP_JOB + if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'" - name: add extra environment variables run: src/ci/scripts/setup-environment.sh env: @@ -196,7 +196,7 @@ jobs: uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master with: github_token: "${{ secrets.github_token }}" - if: success() && !env.SKIP_JOB + if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'" - name: add extra environment variables run: src/ci/scripts/setup-environment.sh env: @@ -626,7 +626,7 @@ jobs: uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master with: github_token: "${{ secrets.github_token }}" - if: success() && !env.SKIP_JOB + if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'" - name: add extra environment variables run: src/ci/scripts/setup-environment.sh env: diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 81a334cd487..813c35cb9d5 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -103,6 +103,7 @@ 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' <<: *step - name: add extra environment variables |