Skip to content

Commit f357475

Browse files
committed
Auto merge of #110952 - ehuss:update-awscli, r=cuviper
Update awscli The Windows GitHub Actions image just updated to pip 23.1.1 which broke the PyYaml installer in the current AWS CLI mirror. It now requires setuptools, wheel, and Cython to be installed manually. This updates to include that, as well as updating the versions of all the packages. This also now uses python3 on macOS since python2 doesn't work with the newer versions. I have only tested that these install correctly, but not that they work correctly. Pietro mentioned that we should just switch to aws cli 2, which I agree is probably the better solution. I'm posting this PR in case it helps unblock CI.
2 parents 43a7802 + dd6314f commit f357475

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/ci/scripts/install-awscli.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010
#
1111
# Before compressing please make sure all the wheels end with `-none-any.whl`.
1212
# If that's not the case you'll need to remove the non-cross-platform ones and
13-
# replace them with the .tar.gz downloaded from https://pypi.org. Also make
14-
# sure it's possible to call this script with both Python 2 and Python 3.
13+
# replace them with the .tar.gz downloaded from https://pypi.org.
1514

1615
set -euo pipefail
1716
IFS=$'\n\t'
1817

1918
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
2019

21-
MIRROR="${MIRRORS_BASE}/2019-07-27-awscli.tar"
20+
MIRROR="${MIRRORS_BASE}/2023-04-28-awscli.tar"
2221
DEPS_DIR="/tmp/awscli-deps"
2322

2423
pip="pip"
@@ -29,6 +28,8 @@ if isLinux; then
2928

3029
sudo apt-get install -y python3-setuptools python3-wheel
3130
ciCommandAddPath "${HOME}/.local/bin"
31+
elif isMacOS; then
32+
pip="pip3"
3233
fi
3334

3435
mkdir -p "${DEPS_DIR}"

0 commit comments

Comments
 (0)