diff options
| author | bors <bors@rust-lang.org> | 2019-12-24 03:40:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-24 03:40:33 +0000 |
| commit | 625375400cdd172877e81c3ce44ce68f2011af2d (patch) | |
| tree | 2c80e84603e8cc5e868fe94406e6661baca703c0 /src/ci/scripts | |
| parent | a4cd03dee2b57216b5c95084a0b46de130946ad7 (diff) | |
| parent | a76d67f22f08abf355a1b6abd22b8e2b7db700eb (diff) | |
| download | rust-625375400cdd172877e81c3ce44ce68f2011af2d.tar.gz rust-625375400cdd172877e81c3ce44ce68f2011af2d.zip | |
Auto merge of #67575 - Centril:rollup-feikoir, r=Centril
Rollup of 7 pull requests Successful merges: - #67337 (Ensure that evaluating or validating a constant never reads from a static) - #67543 (Add regression tests for fixed ICEs) - #67547 (Cleanup err codes) - #67551 (Add long error code explanation message for E0627) - #67561 (remove `description` from `Error` impls in docs) - #67569 (Clean up unsafety in char::encode_utf8) - #67572 (Use the chocolatey CDN directly to avoid the flaky API) Failed merges: r? @ghost
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 |