diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-12-24 04:40:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-24 04:40:03 +0100 |
| commit | a76d67f22f08abf355a1b6abd22b8e2b7db700eb (patch) | |
| tree | 2c80e84603e8cc5e868fe94406e6661baca703c0 /src/ci/scripts | |
| parent | 20d5df91f460196c5720b22afbd0c07bd5bcf22b (diff) | |
| parent | cefeb663666de29b42a4c233bee14793712613ae (diff) | |
| download | rust-a76d67f22f08abf355a1b6abd22b8e2b7db700eb.tar.gz rust-a76d67f22f08abf355a1b6abd22b8e2b7db700eb.zip | |
Rollup merge of #67572 - aidanhs:aphs-choco-direct-cdn, r=Mark-Simulacrum
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 |