[commit: ghc] wip/jenkins: Debug (818dd89)

[git at git.haskell.org]

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

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

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

commit 818dd8949b86e7d31d1c8ff2a85fe23c76d684be
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed May 31 14:57:34 2017 -0400

    Debug


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

818dd8949b86e7d31d1c8ff2a85fe23c76d684be
 Jenkinsfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 605a635..151bc7b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -106,7 +106,7 @@ def buildGhc(params) {
   stage('Checkout') {
     checkout scm
     sh "git submodule update --init --recursive"
-    sh "${makeCmd} distclean"
+    //sh "${makeCmd} distclean"
   }
 
   stage('Configure') {
@@ -155,14 +155,15 @@ def buildGhc(params) {
   stage('Prepare binary distribution') {
     sh "${makeCmd} binary-dist"
     def json = new JSONObject()
-    def tarName = getMakeValue(makeCmd, 'BIN_DIST_PREP_TAR_COMP')
+    def tarPath = getMakeValue(makeCmd, 'BIN_DIST_PREP_TAR_COMP')
+    def tarName = sh "basename ${tarPath}"
     json.put('commit', resolveCommitSha('HEAD'))
     json.put('tarName', tarName)
     json.put('dirName', getMakeValue(makeCmd, 'BIN_DIST_NAME'))
     json.put('ghcVersion', getMakeValue(makeCmd, 'ProjectVersion'))
     json.put('targetPlatform', getMakeValue(makeCmd, 'TARGETPLATFORM'))
     writeJSON(file: 'bindist.json', json: json)
-    sh 'pwd; ls'
+    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}"
@@ -176,6 +177,7 @@ 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'
   sh "tar -xf ${metadata.tarName}"
   dir("${metadata.bindistName}") {
     try {