Skip to content

Commit a77c552

Browse files
committed
Auto merge of rust-lang#110972 - ehuss:remove-awscli, r=pietroalbini
Remove aws cli install. All runner images have the AWS CLI 2 installed, so there isn't a really strong reason to install our own version anymore. The version we were installing was 1.27.122. The runner images currently have 2.11.x (the exact version varies by image). I do not have the means to really test if the new version has any issues. I looked at all the `aws` commands, and none of them seem to be doing anything unusual. The page at https://docs.aws.amazon.com/cli/latest/userguide/cliv2-migration-changes.html contains a list of all the breaking changes, and I didn't see anything that looked important.
2 parents 31a4f2d + 291b61e commit a77c552

File tree

4 files changed

+6
-51
lines changed

4 files changed

+6
-51
lines changed

.github/workflows/ci.yml

+3-9
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,6 @@ jobs:
9898
- name: show the current environment
9999
run: src/ci/scripts/dump-environment.sh
100100
if: success() && !env.SKIP_JOB
101-
- name: install awscli
102-
run: src/ci/scripts/install-awscli.sh
103-
if: success() && !env.SKIP_JOB
104101
- name: install sccache
105102
run: src/ci/scripts/install-sccache.sh
106103
if: success() && !env.SKIP_JOB
@@ -170,6 +167,7 @@ jobs:
170167
TOOLSTATE_PUBLISH: 1
171168
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
172169
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
170+
AWS_REGION: us-west-1
173171
CACHE_DOMAIN: ci-caches.rust-lang.org
174172
if: "github.event_name == 'push' && github.ref == 'refs/heads/auto' && github.repository == 'rust-lang-ci/rust'"
175173
strategy:
@@ -521,9 +519,6 @@ jobs:
521519
- name: show the current environment
522520
run: src/ci/scripts/dump-environment.sh
523521
if: success() && !env.SKIP_JOB
524-
- name: install awscli
525-
run: src/ci/scripts/install-awscli.sh
526-
if: success() && !env.SKIP_JOB
527522
- name: install sccache
528523
run: src/ci/scripts/install-sccache.sh
529524
if: success() && !env.SKIP_JOB
@@ -593,6 +588,7 @@ jobs:
593588
TOOLSTATE_PUBLISH: 1
594589
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
595590
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
591+
AWS_REGION: us-west-1
596592
CACHE_DOMAIN: ci-caches.rust-lang.org
597593
if: "github.event_name == 'push' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.repository == 'rust-lang-ci/rust'"
598594
strategy:
@@ -637,9 +633,6 @@ jobs:
637633
- name: show the current environment
638634
run: src/ci/scripts/dump-environment.sh
639635
if: success() && !env.SKIP_JOB
640-
- name: install awscli
641-
run: src/ci/scripts/install-awscli.sh
642-
if: success() && !env.SKIP_JOB
643636
- name: install sccache
644637
run: src/ci/scripts/install-sccache.sh
645638
if: success() && !env.SKIP_JOB
@@ -706,6 +699,7 @@ jobs:
706699
TOOLSTATE_PUBLISH: 1
707700
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
708701
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
702+
AWS_REGION: us-west-1
709703
CACHE_DOMAIN: ci-caches.rust-lang.org
710704
if: "github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'rust-lang-ci/rust'"
711705
steps:

src/ci/docker/run.sh

+1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ if [ "$SCCACHE_BUCKET" != "" ]; then
169169
args="$args --env SCCACHE_REGION"
170170
args="$args --env AWS_ACCESS_KEY_ID"
171171
args="$args --env AWS_SECRET_ACCESS_KEY"
172+
args="$args --env AWS_REGION"
172173
else
173174
mkdir -p $HOME/.cache/sccache
174175
args="$args --env SCCACHE_DIR=/sccache --volume $HOME/.cache/sccache:/sccache"

src/ci/github-actions/ci.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ x--expand-yaml-anchors--remove:
5353
# (caches, artifacts...).
5454
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZI5DHEBFL
5555
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZN24CBO55
56+
AWS_REGION: us-west-1
5657
CACHE_DOMAIN: ci-caches.rust-lang.org
5758

5859
- &dummy-variables
@@ -68,6 +69,7 @@ x--expand-yaml-anchors--remove:
6869
# (caches, artifacts...).
6970
CACHES_AWS_ACCESS_KEY_ID: AKIA46X5W6CZOMUQATD5
7071
ARTIFACTS_AWS_ACCESS_KEY_ID: AKIA46X5W6CZH5AYXDVF
72+
AWS_REGION: us-west-1
7173
CACHE_DOMAIN: ci-caches-gha.rust-lang.org
7274

7375
- &base-job
@@ -158,10 +160,6 @@ x--expand-yaml-anchors--remove:
158160
run: src/ci/scripts/dump-environment.sh
159161
<<: *step
160162

161-
- name: install awscli
162-
run: src/ci/scripts/install-awscli.sh
163-
<<: *step
164-
165163
- name: install sccache
166164
run: src/ci/scripts/install-sccache.sh
167165
<<: *step

src/ci/scripts/install-awscli.sh

-38
This file was deleted.

0 commit comments

Comments
 (0)