[commit: ghc] master: gitlab-ci: Try fixing Windows build (9d92212)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9d92212cd7a7de263af127cf1debef227c2ef3bb/ghc

>---------------------------------------------------------------

commit 9d92212cd7a7de263af127cf1debef227c2ef3bb
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 18 17:36:55 2018 -0500

    gitlab-ci: Try fixing Windows build
    
    For some reason curl isn't found on the new builder.


>---------------------------------------------------------------

9d92212cd7a7de263af127cf1debef227c2ef3bb
 .gitlab-ci.yml        | 2 +-
 .gitlab/win32-init.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20a88dd..5efbfe5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/.gitlab/win32-init.sh b/.gitlab/win32-init.sh
index 9141404..dce9be8 100644
--- a/.gitlab/win32-init.sh
+++ b/.gitlab/win32-init.sh
@@ -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