[commit: ghc] wip/jenkins: Fix Windows PATHs (ec4c58a)
git at git.haskell.org
git at git.haskell.org
Mon May 29 20:31:40 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/jenkins
Link : http://ghc.haskell.org/trac/ghc/changeset/ec4c58a1cca29cf56062a65d61ada8475cbc9803/ghc
>---------------------------------------------------------------
commit ec4c58a1cca29cf56062a65d61ada8475cbc9803
Author: Ben Gamari <ben at smart-cactus.org>
Date: Mon May 29 16:31:28 2017 -0400
Fix Windows PATHs
>---------------------------------------------------------------
ec4c58a1cca29cf56062a65d61ada8475cbc9803
Jenkinsfile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 84c175e..10d2280 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,12 +30,17 @@ parallel (
// Requires cygpath plugin?
// Make
"windows 64" : {
+ environment {
+ MSYSTEM=MINGW32
+ PATH = 'C:\\msys64\\mingw32\\bin:C:\\msys64\\home\\ben\\ghc-8.0.2-i386\\bin:$PATH'
+ }
node(label: 'windows && amd64') {buildGhc(runNoFib: false)}
},
"windows 32" : {
node(label: 'windows && amd64') {
environment {
- PATH = 'C:\\msys64\\mingw32\\bin:C:\\msys64\\home\\ben\\ghc-8.0.2-i386:$PATH'
+ MSYSTEM=MINGW64
+ PATH = 'C:\\msys64\\mingw32\\bin:C:\\msys64\\home\\ben\\ghc-8.0.2-i386\\bin:$PATH'
}
buildGhc(runNoFib: false)
}
More information about the ghc-commits
mailing list