gitlab-ci: Try fixing Windows build
authorBen Gamari <ben@smart-cactus.org>
Tue, 18 Dec 2018 22:36:55 +0000 (17:36 -0500)
committerBen Gamari <ben@smart-cactus.org>
Tue, 18 Dec 2018 22:36:55 +0000 (17:36 -0500)
For some reason curl isn't found on the new builder.

.gitlab-ci.yml
.gitlab/win32-init.sh

index 20a88dd..5efbfe5 100644 (file)
@@ -227,7 +227,7 @@ validate-x86_64-windows-hadrian:
   variables:
     GHC_VERSION: "8.6.2"
   script:
-    - bash -e .gitlab/win32-init.sh
+    - bash .gitlab/win32-init.sh
     - |
       set MSYSTEM=MINGW64
       python boot
index 9141404..dce9be8 100644 (file)
@@ -3,7 +3,7 @@
 set -e
 
 toolchain=`pwd`/toolchain
-PATH="$toolchain/bin:$PATH"
+PATH="$toolchain/bin:/mingw64/bin:$PATH"
 
 if [ -d "`pwd`/cabal-cache" ]; then
     cp -Rf cabal-cache $APPDATA/cabal