[commit: ghc] wip/jenkins: Reformat (4e1ce6d)

git at git.haskell.org git at git.haskell.org
Thu May 18 06:58:17 UTC 2017


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

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

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

commit 4e1ce6db098d0a847289e53db96e9b2a084c5610
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu May 18 02:58:05 2017 -0400

    Reformat


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

4e1ce6db098d0a847289e53db96e9b2a084c5610
 Jenkinsfile | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index aff2240..9af2814 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,13 +12,26 @@ properties(
   ])
 
 parallel (
-  "linux x86-64"       : {node(label: 'linux && amd64') {buildGhc(runNoFib: params.runNofib)}},
-  "linux x86-64 unreg" : {node(label: 'linux && amd64') {buildGhc(unreg: true)}},
+  "linux x86-64"       : {
+    node(label: 'linux && amd64') {buildGhc(runNoFib: params.runNofib)}
+  },
+  "linux x86-64 -> aarch64 unreg" : {
+    node(label: 'linux && amd64') {buildGhc(crossTarget: 'aarch64-linux-gnu', unreg: true)}
+  },
   "linux x86-64 -> aarch64" : {
-    node(label: 'linux && amd64') {buildGhc(runNoFib: params.runNofib, crossTarget: 'aarch64-linux-gnu')}},
-  "aarch64"            : {node(label: 'linux && aarch64') {buildGhc(runNoFib: false)}},
-  "windows 64"         : {node(label: 'windows && amd64') {buildGhc(msys: 64)}},
-  "windows 32"         : {node(label: 'windows && amd64') {buildGhc(msys: 32)}},
+    node(label: 'linux && amd64') {buildGhc(runNoFib: params.runNofib, crossTarget: 'aarch64-linux-gnu')}
+  },
+  "aarch64"            : {
+    node(label: 'linux && aarch64') {buildGhc(runNoFib: false)}
+  },
+  // Requires cygpath plugin?
+  // Make
+  "windows 64"         : {
+    node(label: 'windows && amd64') {buildGhc(msys: 64)}
+  },
+  "windows 32"         : {
+    node(label: 'windows && amd64') {buildGhc(msys: 32)}
+  },
   //"osx"                : {node(label: 'darwin') {buildGhc(runNoFib: params.runNoFib)}}
 )
 



More information about the ghc-commits mailing list