[commit: ghc] wip/jenkins: Ensure HOME is expanded (7cd7608)

git at git.haskell.org git at git.haskell.org
Fri Jul 28 16:44:08 UTC 2017


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

On branch  : wip/jenkins
Link       : http://ghc.haskell.org/trac/ghc/changeset/7cd7608500de0f5c1f22a8fac4244e1075a6a373/ghc

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

commit 7cd7608500de0f5c1f22a8fac4244e1075a6a373
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Jun 18 16:35:12 2017 -0400

    Ensure HOME is expanded


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

7cd7608500de0f5c1f22a8fac4244e1075a6a373
 Jenkinsfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d559f06..9aac44f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -111,14 +111,15 @@ def withMingw(String msystem, Closure f) {
   // Derived from msys2's /etc/msystem
   def msysRoot = 'C:\\msys64'
   String carch, prefix, ghcPath
+  home = sh(script: 'echo $HOME', returnStdout: true)
   if (msystem == 'MINGW32') {
     prefix = "${msysRoot}\\mingw32"
     carch = 'i686'
-    ghcPath = '$HOME/ghc-8.0.1-i386/bin'
+    ghcPath = "${home}/ghc-8.0.1-i386/bin"
   } else if (msystem == 'MINGW64') {
     prefix = "${msysRoot}\\mingw64"
     carch = 'x86_64'
-    ghcPath = '$HOME/ghc-8.0.2-x86_64/bin'
+    ghcPath = "${home}/ghc-8.0.2-x86_64/bin"
   } else {
     fail
   }



More information about the ghc-commits mailing list