diff options
| author | Jake Goulding <jake.goulding@gmail.com> | 2020-09-26 09:39:53 -0400 |
|---|---|---|
| committer | Jake Goulding <jake.goulding@gmail.com> | 2020-09-28 07:45:39 -0400 |
| commit | 9da1582b8ecf656ccab2f3b41564ba00b7d2d380 (patch) | |
| tree | 487f9c969cae219b29fdcbecf7a454e462e36808 /src/ci/github-actions | |
| parent | 96555ba608cff7c33ff6f0ea4a81ed34d5a5ea3b (diff) | |
| download | rust-9da1582b8ecf656ccab2f3b41564ba00b7d2d380.tar.gz rust-9da1582b8ecf656ccab2f3b41564ba00b7d2d380.zip | |
Move the try builder below the auto builders
This allows us to make use of a YAML anchor when specifying the try builder config.
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index ea7e65a1168..a798ab1c704 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -284,18 +284,6 @@ jobs: CI_ONLY_WHEN_SUBMODULES_CHANGED: 1 <<: *job-linux-xl - try: - <<: *base-ci-job - name: try - env: - <<: [*shared-ci-variables, *prod-variables] - if: github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust' - strategy: - matrix: - include: - - name: dist-x86_64-linux - <<: *job-linux-xl - auto: <<: *base-ci-job name: auto @@ -634,6 +622,18 @@ jobs: - name: aarch64-gnu <<: *job-aarch64-linux + try: + <<: *base-ci-job + name: try + env: + <<: [*shared-ci-variables, *prod-variables] + if: github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust' + strategy: + matrix: + include: + - name: dist-x86_64-linux + <<: *job-linux-xl + master: name: master runs-on: ubuntu-latest |