diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-10-31 02:54:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 02:54:08 +0100 |
| commit | ce64b170eb405f04ec4462d0184db2bf85953579 (patch) | |
| tree | 8e40fb7b7b99f561398b1cfad9919b7cef904978 /src/ci/scripts | |
| parent | 97b9d1023d80931ce9b2fe768526e419344a657d (diff) | |
| parent | 48d6510f6f0b44d4cdd3ebd0699d7ad703de6169 (diff) | |
| download | rust-ce64b170eb405f04ec4462d0184db2bf85953579.tar.gz rust-ce64b170eb405f04ec4462d0184db2bf85953579.zip | |
Rollup merge of #65955 - pietroalbini:master-revert-msys2-hack, r=Mark-Simulacrum
ci: revert msys2 ca-certificates hack The hack was added because upstream msys2 broke the ca-certificates package, but since then it has been fixed. This reverts CI to use the upstream package. Part of #65767
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-msys2-packages.sh | 8 | ||||
| -rwxr-xr-x | src/ci/scripts/install-msys2.sh | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/ci/scripts/install-msys2-packages.sh b/src/ci/scripts/install-msys2-packages.sh index 375f13f30b3..36d9202f7a2 100755 --- a/src/ci/scripts/install-msys2-packages.sh +++ b/src/ci/scripts/install-msys2-packages.sh @@ -8,14 +8,6 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isWindows; then pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar - # FIXME(#65767): workaround msys bug, step 2 - arch=i686 - if [ "$MSYS_BITS" = "64" ]; then - arch=x86_64 - fi - pacman -U --noconfirm --noprogressbar mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz - rm mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz - # Make sure we use the native python interpreter instead of some msys equivalent # one way or another. The msys interpreters seem to have weird path conversions # baked in which break LLVM's build system one way or another, so let's use the diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh index 8b631192ea2..ce37c3b1469 100755 --- a/src/ci/scripts/install-msys2.sh +++ b/src/ci/scripts/install-msys2.sh @@ -1,5 +1,4 @@ #!/bin/bash -# ignore-tidy-linelength # Download and install MSYS2, needed primarily for the test suite (run-make) but # also used by the MinGW toolchain for assembling things. # @@ -13,13 +12,6 @@ IFS=$'\n\t' source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isWindows; then - # FIXME(#65767): workaround msys bug, step 1 - arch=i686 - if [ "$MSYS_BITS" = "64" ]; then - arch=x86_64 - fi - curl -O "${MIRRORS_BASE}/msys2-repo/mingw/$arch/mingw-w64-$arch-ca-certificates-20180409-1-any.pkg.tar.xz" - choco install msys2 --params="/InstallDir:${SYSTEM_WORKFOLDER}/msys2 /NoPath" -y --no-progress mkdir -p "${SYSTEM_WORKFOLDER}/msys2/home/${USERNAME}" |