diff options
| author | Eric Huss <eric@huss.org> | 2023-04-28 18:16:34 -0700 |
|---|---|---|
| committer | Eric Huss <eric@huss.org> | 2023-04-28 18:16:34 -0700 |
| commit | 7cb798c24f000b7789d27362d769f78797de7f83 (patch) | |
| tree | 56988487f60edac79992f7a53cfbdb573964f37a | |
| parent | f35747517052240277835b6b2dec553ba547ec00 (diff) | |
| download | rust-7cb798c24f000b7789d27362d769f78797de7f83.tar.gz rust-7cb798c24f000b7789d27362d769f78797de7f83.zip | |
Remove aws cli install.
| -rw-r--r-- | .github/workflows/ci.yml | 9 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 4 | ||||
| -rwxr-xr-x | src/ci/scripts/install-awscli.sh | 38 |
3 files changed, 0 insertions, 51 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32c18cab099..9e8576d7b1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,9 +98,6 @@ jobs: - name: show the current environment run: src/ci/scripts/dump-environment.sh if: success() && !env.SKIP_JOB - - name: install awscli - run: src/ci/scripts/install-awscli.sh - if: success() && !env.SKIP_JOB - name: install sccache run: src/ci/scripts/install-sccache.sh if: success() && !env.SKIP_JOB @@ -521,9 +518,6 @@ jobs: - name: show the current environment run: src/ci/scripts/dump-environment.sh if: success() && !env.SKIP_JOB - - name: install awscli - run: src/ci/scripts/install-awscli.sh - if: success() && !env.SKIP_JOB - name: install sccache run: src/ci/scripts/install-sccache.sh if: success() && !env.SKIP_JOB @@ -637,9 +631,6 @@ jobs: - name: show the current environment run: src/ci/scripts/dump-environment.sh if: success() && !env.SKIP_JOB - - name: install awscli - run: src/ci/scripts/install-awscli.sh - if: success() && !env.SKIP_JOB - name: install sccache run: src/ci/scripts/install-sccache.sh if: success() && !env.SKIP_JOB 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 diff --git a/src/ci/scripts/install-awscli.sh b/src/ci/scripts/install-awscli.sh deleted file mode 100755 index aa62407eaea..00000000000 --- a/src/ci/scripts/install-awscli.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# This script downloads and installs awscli from the packages mirrored in our -# own S3 bucket. This follows the recommendations at: -# -# https://packaging.python.org/guides/index-mirrors-and-caches/#caching-with-pip -# -# To create a new mirrored copy you can run the command: -# -# pip wheel awscli -# -# Before compressing please make sure all the wheels end with `-none-any.whl`. -# If that's not the case you'll need to remove the non-cross-platform ones and -# replace them with the .tar.gz downloaded from https://pypi.org. - -set -euo pipefail -IFS=$'\n\t' - -source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" - -MIRROR="${MIRRORS_BASE}/2023-04-28-awscli.tar" -DEPS_DIR="/tmp/awscli-deps" - -pip="pip" -pipflags="" -if isLinux; then - pip="pip3" - pipflags="--user" - - sudo apt-get install -y python3-setuptools python3-wheel - ciCommandAddPath "${HOME}/.local/bin" -elif isMacOS; then - pip="pip3" -fi - -mkdir -p "${DEPS_DIR}" -curl "${MIRROR}" | tar xf - -C "${DEPS_DIR}" -"${pip}" install ${pipflags} --no-index "--find-links=${DEPS_DIR}" awscli -rm -rf "${DEPS_DIR}" |
