[commit: ghc] wip/jenkins: Fix tarball names (c86cec4)

[git at git.haskell.org]

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

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

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

commit c86cec4b6731cce5a1834c1940bd266265f3e8c1
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Jun 4 10:34:37 2017 -0400

    Fix tarball names


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

c86cec4b6731cce5a1834c1940bd266265f3e8c1
 Jenkinsfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3b31238..d2f39f3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,10 +35,11 @@ stage("Build source distribution") {
         """
     }
     stage("Build tarballs") {
+      def version = getMakeValue('make', 'ProjectVersion')
       sh "make sdist"
-      sh "mv sdistprep/ghc-*.tar.xz ghc-src.tar.xz"
-      sh "mv sdistprep/ghc-*-testsuite.tar.xz ghc-testsuite.tar.xz"
-      sh "mv sdistprep/ghc-*-windows-extra-src-*.tar.xz ghc-win32-tarballs.tar.xz"
+      sh "mv sdistprep/ghc-${version}-src.tar.xz ghc-src.tar.xz"
+      sh "mv sdistprep/ghc-${version}-testsuite.tar.xz ghc-testsuite.tar.xz"
+      sh "mv sdistprep/ghc-${version}-windows-extra-src.tar.xz ghc-win32-tarballs.tar.xz"
       stash(name: 'source-dist', includes: 'ghc-src.tar.xz,ghc-win32-tarballs.tar.xz')
       stash(name: 'testsuite-dist', includes: 'ghc-testsuite.tar.xz')
     }
@@ -194,7 +195,7 @@ def buildGhc(params) {
 }
 
 def getMakeValue(String makeCmd, String value) {
-  return sh(script: "${makeCmd} -s echo VALUE=${value}", returnStdout: true)
+  return sh(script: "${makeCmd} -s echo! VALUE=${value}", returnStdout: true)
 }
 
 def withTempDir(String name, Closure f) {