[commit: ghc] wip/jenkins: More debugging (df4de7f)

[git at git.haskell.org]

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

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

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

commit df4de7f8b576b6dbfbf09d84a35e65da366c4bba
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Jun 3 17:02:01 2017 -0400

    More debugging


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

df4de7f8b576b6dbfbf09d84a35e65da366c4bba
 Jenkinsfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 151bc7b..b40186c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -162,8 +162,9 @@ def buildGhc(params) {
     json.put('dirName', getMakeValue(makeCmd, 'BIN_DIST_NAME'))
     json.put('ghcVersion', getMakeValue(makeCmd, 'ProjectVersion'))
     json.put('targetPlatform', getMakeValue(makeCmd, 'TARGETPLATFORM'))
+    echo "${json}"
+    echo json.toString()
     writeJSON(file: 'bindist.json', json: json)
-    sh 'cat bindist.json'
     // Write a file so we can easily file the tarball and bindist directory later
     stash(name: "bindist-${targetTriple}", includes: "bindist.json,${tarName}")
     archiveArtifacts "${tarName}"
@@ -177,9 +178,9 @@ def getMakeValue(String makeCmd, String value) {
 def withGhcBinDist(String targetTriple, Closure f) {
   unstash "bindist-${targetTriple}"
   def metadata = readJSON file: "bindist.json"
-  sh 'cat bindist.json'
+  echo "${metadata}"
   sh "tar -xf ${metadata.tarName}"
-  dir("${metadata.bindistName}") {
+  dir("${metadata.dirName}") {
     try {
       f
     } finally {