diff options
| author | Mateusz Mikuła <mati865@gmail.com> | 2020-05-22 19:06:28 +0200 |
|---|---|---|
| committer | Mateusz Mikuła <mati865@gmail.com> | 2020-05-22 19:08:39 +0200 |
| commit | 4b516279a91701eaef7100ea321a38016993c06c (patch) | |
| tree | 963b133e4a094980ea9c302075c7b9a8e13d3ca7 | |
| parent | 2d4d0dbaa72396e1781f3a3f9d6115e9e3abfdd2 (diff) | |
| download | rust-4b516279a91701eaef7100ea321a38016993c06c.tar.gz rust-4b516279a91701eaef7100ea321a38016993c06c.zip | |
Revert MSYS2 CI workaround
| -rwxr-xr-x | src/ci/scripts/install-msys2-packages.sh | 11 | ||||
| -rwxr-xr-x | src/ci/scripts/install-msys2.sh | 3 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/ci/scripts/install-msys2-packages.sh b/src/ci/scripts/install-msys2-packages.sh index 8fefddd959c..ff7479c05d0 100755 --- a/src/ci/scripts/install-msys2-packages.sh +++ b/src/ci/scripts/install-msys2-packages.sh @@ -6,17 +6,6 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isWindows; then - # 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 b94eb5fc6dd..3c3b5007f86 100755 --- a/src/ci/scripts/install-msys2.sh +++ b/src/ci/scripts/install-msys2.sh @@ -17,9 +17,8 @@ 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 chocolatey updates MSYS2 choco install -s . msys2 \ - --params="/InstallDir:$(ciCheckoutPath)/msys2 /NoPath /NoUpdate" -y --no-progress + --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" |