[commit: ghc] wip/jenkins: Fix JSON serialization (1e55852)
git at git.haskell.org
git at git.haskell.org
Wed May 31 14:43:42 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/jenkins
Link : http://ghc.haskell.org/trac/ghc/changeset/1e558525120b5d035af04f504fc8c0e0e41ab728/ghc
>---------------------------------------------------------------
commit 1e558525120b5d035af04f504fc8c0e0e41ab728
Author: Ben Gamari <ben at smart-cactus.org>
Date: Wed May 31 10:43:24 2017 -0400
Fix JSON serialization
>---------------------------------------------------------------
1e558525120b5d035af04f504fc8c0e0e41ab728
Jenkinsfile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d6122ef..ad6df30 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -152,13 +152,13 @@ def buildGhc(params) {
stage('Prepare binary distribution') {
sh "${makeCmd} binary-dist"
- writeJSON(file: 'bindist.json', json: {
- commit: resolveCommitSha('HEAD')
- tarName: getMakeValue(makeCmd, 'BIN_DIST_PREP_TAR_COMP')
- dirName: getMakeValue(makeCmd, 'BIN_DIST_NAME')
- ghcVersion: getMakeValue(makeCmd, 'ProjectVersion')
- targetPlatform: getMakeValue(makeCmd, 'TARGETPLATFORM')
- })
+ def json = new JSONObject()
+ json.put('commit', resolveCommitSha('HEAD'))
+ json.put('tarName', getMakeValue(makeCmd, 'BIN_DIST_PREP_TAR_COMP'))
+ 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'
// Write a file so we can easily file the tarball and bindist directory later
stash(name: "bindist-${targetTriple}", includes: "bindist.json,${tarName}")
More information about the ghc-commits
mailing list