user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci: fix installation condition for MinGW

Browse source 
I mistakenly inverted the "variable is not set" check in bash.
This commit is contained in:
Pietro Albini 2019-10-22 17:10:08 +02:00
parent db0078706b
commit 19fdc5c07f
No known key found for this signature in database
GPG key ID: 3E06ABE80BAAF19C
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ci/scripts/install-mingw.sh
View file

@ -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