From 7cb798c24f000b7789d27362d769f78797de7f83 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Fri, 28 Apr 2023 18:16:34 -0700 Subject: Remove aws cli install. --- src/ci/github-actions/ci.yml | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/ci/github-actions') diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 8409b9ca569..1e28497b146 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -154,10 +154,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 -- cgit 1.4.1-3-g733a5 From 291b61e94fedd12de67c17c3fbae104a81d7115a Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Sun, 30 Apr 2023 13:23:48 -0700 Subject: Set the AWS region. --- .github/workflows/ci.yml | 3 +++ src/ci/docker/run.sh | 1 + src/ci/github-actions/ci.yml | 2 ++ 3 files changed, 6 insertions(+) (limited to 'src/ci/github-actions') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e8576d7b1b..1106e186a4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -167,6 +167,7 @@ jobs: TOOLSTATE_PUBLISH: 1 CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55 + AWS_REGION: us-west-1 CACHE_DOMAIN: ci-caches.rust-lang.org if: "github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'" strategy: @@ -587,6 +588,7 @@ jobs: TOOLSTATE_PUBLISH: 1 CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55 + AWS_REGION: us-west-1 CACHE_DOMAIN: ci-caches.rust-lang.org if: "github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'" strategy: @@ -697,6 +699,7 @@ jobs: TOOLSTATE_PUBLISH: 1 CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55 + AWS_REGION: us-west-1 CACHE_DOMAIN: ci-caches.rust-lang.org if: "github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'rust-lang-ci/rust'" steps: diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 69d4916e5a9..8bea8cd4c87 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -169,6 +169,7 @@ if [ "$SCCACHE_BUCKET" != "" ]; then args="$args --env SCCACHE_REGION" args="$args --env AWS_ACCESS_KEY_ID" args="$args --env AWS_SECRET_ACCESS_KEY" + args="$args --env AWS_REGION" else mkdir -p $HOME/.cache/sccache args="$args --env SCCACHE_DIR=/sccache --volume $HOME/.cache/sccache:/sccache" diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 1e28497b146..4f965cfd52d 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 -- cgit 1.4.1-3-g733a5 From 453c632b230c4c9bac408fa406f20e656fccc51e Mon Sep 17 00:00:00 2001 From: jyn Date: Thu, 4 May 2023 17:42:44 -0500 Subject: Remove `tidy` key in PR CI This avoids confusing error messages when adding an `auto` job to CI (as recommended in the dev-guide: https://rustc-dev-guide.rust-lang.org/tests/ci.html#using-ci-to-test). --- .github/workflows/ci.yml | 6 +----- src/ci/github-actions/ci.yml | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'src/ci/github-actions') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcdaa06caa2..277755b2883 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,24 +42,20 @@ jobs: TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate" CACHE_DOMAIN: ci-caches.rust-lang.org 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 - tidy: false os: ubuntu-20.04-16core-64gb env: {} - name: mingw-check-tidy - tidy: true os: ubuntu-20.04-16core-64gb env: {} - name: x86_64-gnu-llvm-14 - tidy: false os: ubuntu-20.04-16core-64gb env: {} - name: x86_64-gnu-tools - tidy: false os: ubuntu-20.04-16core-64gb env: {} timeout-minutes: 600 diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 5661adf6776..9d90319e93f 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -300,25 +300,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: -- cgit 1.4.1-3-g733a5