[commit: ghc] wip/jenkins: Fix tarball generation (6282d63)

[git at git.haskell.org]

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

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

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

commit 6282d636e1af723e596c4af25902ed81249f0984
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue May 30 10:43:09 2017 -0400

    Fix tarball generation


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

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 4b7a9a5..29902ed 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -148,8 +148,9 @@ def buildGhc(params) {
     sh "${makeCmd} binary-dist"
     def tarName = sh(script: "${makeCmd} -s echo VALUE=BIN_DIST_PREP_TAR_COMP",
                      returnStdout: true)
-    def ghcVersion = sh(script: "${makeCmd} -s echo VALUE=ProjectVersion")
-    writeFile "ghc-version" ghcVersion
+    def ghcVersion = sh(script: "${makeCmd} -s echo VALUE=ProjectVersion",
+                        returnStdout: true)
+    writeFile(file: "ghc-version", text: ghcVersion)
     archiveArtifacts "../${tarName}"
     // Write a file so we can easily file the tarball and bindist directory later
     stash(name: "bindist-${targetTriple}", includes: "ghc-version,../${tarName}")
@@ -205,7 +206,7 @@ def testGhc(params) {
 // Expects to be sitting in a build source tree.
 def updateReadTheDocs() {
   git clone 'git at github.com:bgamari/ghc-users-guide'
-  def commit = sh("git rev-parse HEAD", returnStdout=true)
+  def commit = sh(script: "git rev-parse HEAD", returnStdout=true)
   sh """
      export GHC_TREE=$(pwd)
      cd ghc-users-guide