[commit: ghc] wip/jenkins: Rework handling of Windows (54c2269)

[git at git.haskell.org]

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

On branch  : wip/jenkins
Link       : http://ghc.haskell.org/trac/ghc/changeset/54c226979875c4952e4dc4fc1dad794adb8d4983/ghc

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

commit 54c226979875c4952e4dc4fc1dad794adb8d4983
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon May 29 13:08:49 2017 -0400

    Rework handling of Windows


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

54c226979875c4952e4dc4fc1dad794adb8d4983
 Jenkinsfile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 20dbec0..571cbb0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,10 +30,18 @@ parallel (
   // Requires cygpath plugin?
   // Make
   "windows 64"         : {
-    node(label: 'windows && amd64') {buildGhc(msys: 64)}
+    environment {
+      PATH = 'C:\\msys64\\mingw64\\bin:C:\\msys64\\home\\ben\\ghc-8.0.2-x86_64:$PATH'
+    }
+    node(label: 'windows && amd64') {buildGhc()}
   },
   "windows 32"         : {
-    node(label: 'windows && amd64') {buildGhc(msys: 32)}
+    node(label: 'windows && amd64') {
+      environment {
+        PATH = 'C:\\msys64\\mingw32\\bin:C:\\msys64\\home\\ben\\ghc-8.0.2-i386:$PATH'
+      }
+      buildGhc()
+    }
   },
   //"osx"                : {node(label: 'darwin') {buildGhc(runNoFib: params.runNoFib)}}
 )
@@ -46,7 +54,6 @@ def buildGhc(params) {
   boolean runNoFib = params?.runNofib ?: false
   String crossTarget = params?.crossTarget
   boolean unreg = params?.unreg ?: false
-  String msys = params?.msys;
 
   stage('Checkout') {
     checkout scm