diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2019-10-22 17:10:08 +0200 |
|---|---|---|
| committer | Pietro Albini <pietro@pietroalbini.org> | 2019-10-25 16:47:41 +0200 |
| commit | 19fdc5c07f7222dbf7ac34cdee6986945059d797 (patch) | |
| tree | 890fb66f7d686415b619a4424e231908749e8d17 /src/ci/scripts | |
| parent | db0078706b47f7ee0e492a15995ae55ae70c086d (diff) | |
| download | rust-19fdc5c07f7222dbf7ac34cdee6986945059d797.tar.gz rust-19fdc5c07f7222dbf7ac34cdee6986945059d797.zip | |
ci: fix installation condition for MinGW
I mistakenly inverted the "variable is not set" check in bash.
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-mingw.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 5a1c19b8981..b4e8b889f52 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -29,11 +29,6 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isWindows; then if [[ -z "${MINGW_URL+x}" ]]; then - curl -o mingw.7z "${MINGW_URL}/${MINGW_ARCHIVE}" - 7z x -y mingw.7z > /dev/null - curl -o "${MINGW_DIR}/bin/gdborig.exe" "${MINGW_URL}/2017-04-20-${MSYS_BITS}bit-gdborig.exe" - ciCommandAddPath "$(pwd)/${MINGW_DIR}/bin" - else arch=i686 if [ "$MSYS_BITS" = "64" ]; then arch=x86_64 @@ -41,5 +36,10 @@ if isWindows; then pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \ mingw-w64-$arch-gcc mingw-w64-$arch-python2 ciCommandAddPath "${SYSTEM_WORKFOLDER}/msys2/mingw${MSYS_BITS}/bin" + else + curl -o mingw.7z "${MINGW_URL}/${MINGW_ARCHIVE}" + 7z x -y mingw.7z > /dev/null + curl -o "${MINGW_DIR}/bin/gdborig.exe" "${MINGW_URL}/2017-04-20-${MSYS_BITS}bit-gdborig.exe" + ciCommandAddPath "$(pwd)/${MINGW_DIR}/bin" fi fi |