summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2017-09-27 19:17:10 -0400
committerBen Gamari <ben@smart-cactus.org>2017-09-27 19:17:10 -0400
commit9150d49781377197559c474d250c1dd2495f6a10 (patch)
tree3e971c02d1f62516237acda11956f533ed5fa327
parentaf4939aca6c0b2bc22026c82587e2a9aed845a9a (diff)
downloadhaskell-9150d49781377197559c474d250c1dd2495f6a10.tar.gz
Clean up build names
-rw-r--r--Jenkinsfile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index cec4c38ba8..63012cedaa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,7 +62,7 @@ stage("Build source distribution") {
}
parallel (
- "linux x86-64" : {
+ "amd64 linux" : {
node(label: 'linux && amd64') {
buildAndTestGhc(targetTriple: 'x86_64-linux-gnu')
if (params.build_docs) {
@@ -71,34 +71,34 @@ parallel (
}
}
},
- //"linux x86-64 -> aarch64 unreg" : {
+ //"amd64 linux -> aarch64 linux unreg" : {
// node(label: 'linux && amd64') {buildGhc(crossCompiling: true, targetTriple: 'aarch64-linux-gnu', unreg: true)}
//},
- //"linux x86-64 -> aarch64" : {
+ //"amd64 linux -> aarch64 linux" : {
// node(label: 'linux && amd64') {buildGhc(crossCompiling: true, targetTriple: 'aarch64-linux-gnu')}
// node(label: 'linux && aarch64') {testGhc(targetTriple: 'aarch64-linux-gnu')}
//},
- "aarch64" : {
+ "aarch64 linux" : {
node(label: 'linux && aarch64') {buildGhc(targetTriple: 'aarch64-linux-gnu')}
},
- "freebsd" : {
+ "amd64 freebsd" : {
node(label: 'freebsd && amd64') {
buildGhc(targetTriple: 'x86_64-portbld-freebsd11.0', makeCmd: 'gmake', disableLargeAddrSpace: true)
}
},
// Requires cygpath plugin?
- "windows 64" : {
+ "amd64 windows" : {
node(label: 'windows && amd64') {
withMingw('MINGW64') { buildAndTestGhc(targetTriple: 'x86_64-w64-mingw32') }
}
},
- "windows 32" : {
+ "i386 windows" : {
node(label: 'windows && amd64') {
withMingw('MINGW32') { buildAndTestGhc(targetTriple: 'x86_64-pc-msys') }
}
},
/*
- "osx" : {
+ "amd64 darwin" : {
node(label: 'darwin') {buildGhc(targetTriple: 'x86_64-apple-darwin16.0.0')}
}
*/