diff options
| author | bors <bors@rust-lang.org> | 2023-05-07 21:06:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-07 21:06:36 +0000 |
| commit | 3d5a5167101f0f828a2c7a084a3a7631ad1a44ed (patch) | |
| tree | 2ba1f523436ad377f806a1ba2f131277deac45e0 /src/ci/github-actions | |
| parent | dd9df18792cd13b25a54406ef60e3b32ac358272 (diff) | |
| parent | e476f7ac36e4c77acc158aa7f7d2edc18b5b16fa (diff) | |
| download | rust-3d5a5167101f0f828a2c7a084a3a7631ad1a44ed.tar.gz rust-3d5a5167101f0f828a2c7a084a3a7631ad1a44ed.zip | |
Auto merge of #2878 - RalfJung:rustup, r=RalfJung
Rustup
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 5661adf6776..f81e740936b 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -53,6 +53,7 @@ x--expand-yaml-anchors--remove: # (caches, artifacts...). CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55 + AWS_REGION: us-west-1 CACHE_DOMAIN: ci-caches.rust-lang.org - &dummy-variables @@ -68,6 +69,7 @@ x--expand-yaml-anchors--remove: # (caches, artifacts...). CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZOMUQATD5 ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZH5AYXDVF + AWS_REGION: us-west-1 CACHE_DOMAIN: ci-caches-gha.rust-lang.org - &base-job @@ -158,10 +160,6 @@ x--expand-yaml-anchors--remove: run: src/ci/scripts/dump-environment.sh <<: *step - - name: install awscli - run: src/ci/scripts/install-awscli.sh - <<: *step - - name: install sccache run: src/ci/scripts/install-sccache.sh <<: *step @@ -300,25 +298,21 @@ jobs: env: <<: [*shared-ci-variables, *public-variables] if: github.event_name == 'pull_request' - continue-on-error: ${{ matrix.tidy }} + continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }} strategy: matrix: include: - name: mingw-check <<: *job-linux-16c - tidy: false - name: mingw-check-tidy <<: *job-linux-16c - tidy: true - name: x86_64-gnu-llvm-14 <<: *job-linux-16c - tidy: false - name: x86_64-gnu-tools <<: *job-linux-16c - tidy: false auto: permissions: |