diff options
| author | Aidan Hobson Sayers <aidanhs@cantab.net> | 2019-12-23 23:31:39 +0000 |
|---|---|---|
| committer | Aidan Hobson Sayers <aidanhs@cantab.net> | 2019-12-24 00:59:37 +0000 |
| commit | cefeb663666de29b42a4c233bee14793712613ae (patch) | |
| tree | 625657ab5f3191c64b4bdb6b44b86dc9ce17b265 /src/ci/scripts | |
| parent | 9ae6cedb8d1e37469be1434642a3e403fce50a03 (diff) | |
| download | rust-cefeb663666de29b42a4c233bee14793712613ae.tar.gz rust-cefeb663666de29b42a4c233bee14793712613ae.zip | |
Use the chocolatey CDN directly to avoid the flaky API
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-msys2.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh index 3a78ef209e4..9e899ba9d89 100755 --- a/src/ci/scripts/install-msys2.sh +++ b/src/ci/scripts/install-msys2.sh @@ -12,10 +12,14 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isWindows; then - for RETRY_COUNT in 1 2 3 4 5 6 7 8 9 10; do - choco install msys2 \ - --params="/InstallDir:$(ciCheckoutPath)/msys2 /NoPath" -y --no-progress \ - && mkdir -p "$(ciCheckoutPath)/msys2/home/${USERNAME}" \ - && ciCommandAddPath "$(ciCheckoutPath)/msys2/usr/bin" && break - done + # Pre-followed the api/v2 URL to the CDN since the API can be a bit flakey + curl -sSL https://packages.chocolatey.org/msys2.20190524.0.0.20191030.nupkg > \ + msys2.nupkg + curl -sSL https://packages.chocolatey.org/chocolatey-core.extension.1.3.5.1.nupkg > \ + chocolatey-core.extension.nupkg + choco install -s . msys2 \ + --params="/InstallDir:$(ciCheckoutPath)/msys2 /NoPath" -y --no-progress + rm msys2.nupkg chocolatey-core.extension.nupkg + mkdir -p "$(ciCheckoutPath)/msys2/home/${USERNAME}" + ciCommandAddPath "$(ciCheckoutPath)/msys2/usr/bin" fi |