diff options
| author | bors <bors@rust-lang.org> | 2020-05-20 15:55:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-20 15:55:59 +0000 |
| commit | 8858a435f3eef655df3e4fb6bec15d33e44a374e (patch) | |
| tree | 17f79aaae97b1134deea938d2e5a28f0b723cf8e /src/ci/scripts | |
| parent | f182c4af8a22df906f6e901cb11a1a804f29f32c (diff) | |
| parent | 2d4d0dbaa72396e1781f3a3f9d6115e9e3abfdd2 (diff) | |
| download | rust-8858a435f3eef655df3e4fb6bec15d33e44a374e.tar.gz rust-8858a435f3eef655df3e4fb6bec15d33e44a374e.zip | |
Auto merge of #72384 - mati865:ci-fix, r=pietroalbini
Workaround MSYS2/chocolatey issue again
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-msys2-packages.sh | 12 | ||||
| -rwxr-xr-x | src/ci/scripts/install-msys2.sh | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/ci/scripts/install-msys2-packages.sh b/src/ci/scripts/install-msys2-packages.sh index 3b25e329a2d..8fefddd959c 100755 --- a/src/ci/scripts/install-msys2-packages.sh +++ b/src/ci/scripts/install-msys2-packages.sh @@ -6,8 +6,16 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isWindows; then - # FIXME(mati865): hopefully temporary workaround for MSYS2 issue - pacman -Sy --noconfirm pacman + # FIXME(mati865): temporary workaround until chocolatey updates their MSYS2 + base_url='https://ci-mirrors.rust-lang.org/rustc/msys2-repo/msys/x86_64' + curl ${base_url}/libzstd-1.4.4-2-x86_64.pkg.tar.xz -o libzstd-1.4.4-2-x86_64.pkg.tar.xz + curl ${base_url}/pacman-5.2.1-6-x86_64.pkg.tar.xz -o pacman-5.2.1-6-x86_64.pkg.tar.xz + curl ${base_url}/zstd-1.4.4-2-x86_64.pkg.tar.xz -o zstd-1.4.4-2-x86_64.pkg.tar.xz + pacman -U --noconfirm libzstd-1.4.4-2-x86_64.pkg.tar.xz pacman-5.2.1-6-x86_64.pkg.tar.xz \ + zstd-1.4.4-2-x86_64.pkg.tar.xz + rm libzstd-1.4.4-2-x86_64.pkg.tar.xz pacman-5.2.1-6-x86_64.pkg.tar.xz \ + zstd-1.4.4-2-x86_64.pkg.tar.xz + pacman -Sy pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar \ binutils diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh index 952a0d3de45..b94eb5fc6dd 100755 --- a/src/ci/scripts/install-msys2.sh +++ b/src/ci/scripts/install-msys2.sh @@ -17,7 +17,7 @@ if isWindows; then msys2.nupkg curl -sSL https://packages.chocolatey.org/chocolatey-core.extension.1.3.5.1.nupkg > \ chocolatey-core.extension.nupkg - # FIXME(mati865): remove `/NoUpdate` once MSYS2 issue is fixed + # FIXME(mati865): remove `/NoUpdate` once chocolatey updates MSYS2 choco install -s . msys2 \ --params="/InstallDir:$(ciCheckoutPath)/msys2 /NoPath /NoUpdate" -y --no-progress rm msys2.nupkg chocolatey-core.extension.nupkg |