diff options
| author | bors <bors@rust-lang.org> | 2020-05-18 18:40:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-18 18:40:07 +0000 |
| commit | d8878868c8d7ef3779e7243953fc050cbb0e0565 (patch) | |
| tree | 0845bc88ecedffcdd4ef26620050fa90a223bb5b /src/ci/scripts | |
| parent | 9e2a6a29ce82e4fc5decad86dab7911a38582438 (diff) | |
| parent | 081daf609c585e70d6c2299c7869c7d4f215b844 (diff) | |
| download | rust-d8878868c8d7ef3779e7243953fc050cbb0e0565.tar.gz rust-d8878868c8d7ef3779e7243953fc050cbb0e0565.zip | |
Auto merge of #72332 - mati865:ci-fix, r=pietroalbini
CI: Workaround MSYS2 issue
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-msys2-packages.sh | 3 | ||||
| -rwxr-xr-x | src/ci/scripts/install-msys2.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ci/scripts/install-msys2-packages.sh b/src/ci/scripts/install-msys2-packages.sh index ff7479c05d0..3b25e329a2d 100755 --- a/src/ci/scripts/install-msys2-packages.sh +++ b/src/ci/scripts/install-msys2-packages.sh @@ -6,6 +6,9 @@ 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 + 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 3c3b5007f86..952a0d3de45 100755 --- a/src/ci/scripts/install-msys2.sh +++ b/src/ci/scripts/install-msys2.sh @@ -17,8 +17,9 @@ 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 choco install -s . msys2 \ - --params="/InstallDir:$(ciCheckoutPath)/msys2 /NoPath" -y --no-progress + --params="/InstallDir:$(ciCheckoutPath)/msys2 /NoPath /NoUpdate" -y --no-progress rm msys2.nupkg chocolatey-core.extension.nupkg mkdir -p "$(ciCheckoutPath)/msys2/home/${USERNAME}" ciCommandAddPath "$(ciCheckoutPath)/msys2/usr/bin" |