OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #67572 - aidanhs:aphs-choco-direct-cdn, r=Mark-Simulacrum 

Use the chocolatey CDN directly to avoid the flaky API
This commit is contained in:
Mazdak Farrokhzad 2019-12-24 04:40:03 +01:00 committed by GitHub
parent 20d5df91f4 cefeb66366
commit a76d67f22f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ci/scripts/install-msys2.sh
View File

@ -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