Skip to content

Commit

Permalink
Start over with a single build
Browse files Browse the repository at this point in the history
  • Loading branch information
guillep committed Jul 4, 2018
1 parent 7524ad5 commit 124c2d1
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,13 @@
properties([disableConcurrentBuilds()])

try {
def builders = [:]
builders['pharo7-32'] = { buildArchitecture('32', '70') }
builders['pharo7-64'] = { buildArchitecture('64', '70') }
builders['pharo6-32'] = { buildArchitecture('32', '61') }
builders['pharo6-64'] = { buildArchitecture('64', '61') }

stage('Prepare upload') {
node('linux') {
cleanUploadFolderIfNeeded(params.VERSION)
}
}
parallel builders

buildArchitecture('32', '61')

node('linux') {
stage('Upload finalization') {
Expand All @@ -31,8 +26,6 @@ try {
def buildArchitecture(architecture, pharoVersion) {
withEnv(["ARCHITECTURE=${architecture}", "PHARO=${pharoVersion}"]) {
node('linux') {
ws{

stage('Checkout from SCM') {
checkout scm
commitHash = sh(returnStdout: true, script: 'git log -1 --format="%p"').trim()
Expand Down Expand Up @@ -79,7 +72,6 @@ def buildArchitecture(architecture, pharoVersion) {
upload(packageFile, params.VERSION)
}
}
}
}
node('windows') {
if (architecture == '32') {
Expand Down

0 comments on commit 124c2d1

Please sign in to comment.