diff options
| author | bors <bors@rust-lang.org> | 2020-04-02 09:10:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-02 09:10:06 +0000 |
| commit | 0f72ce1b271b40a5652049362e6aab5914f7b1d3 (patch) | |
| tree | 5930b8663186f6cc53210e174f0b3ae25aa816c7 | |
| parent | 127a11a344eb59b5aea1464e98257c262dcba967 (diff) | |
| parent | 824dcd424f4a42f6be61b782cd04e18b09177361 (diff) | |
| download | rust-0f72ce1b271b40a5652049362e6aab5914f7b1d3.tar.gz rust-0f72ce1b271b40a5652049362e6aab5914f7b1d3.zip | |
Auto merge of #70628 - pietroalbini:gha-multiple-tries, r=Mark-Simulacrum
GHA: enable running multiple try builds at the same time 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 |