From 9da1582b8ecf656ccab2f3b41564ba00b7d2d380 Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Sat, 26 Sep 2020 09:39:53 -0400 Subject: Move the try builder below the auto builders This allows us to make use of a YAML anchor when specifying the try builder config. --- src/ci/github-actions/ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/ci/github-actions/ci.yml') 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 -- cgit 1.4.1-3-g733a5