ci: fix upload speeds on Windows

By using `s3cmd` through PowerShell instead of Git Bash we improve
upload speeds on Windows slightly, as described here:
https://github.com/status-im/infra-ci/issues/40

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2022-07-18 20:17:48 +02:00
parent 9943a7cf1f
commit 83c066f517
No known key found for this signature in database
GPG Key ID: 09AA5403E54D9931
7 changed files with 31 additions and 19 deletions

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.1' library 'status-jenkins-lib@v1.5.6'
pipeline { pipeline {
agent { label 'linux' } agent { label 'linux' }

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.1' library 'status-jenkins-lib@v1.5.6'
pipeline { pipeline {
agent { agent {
@ -59,7 +59,9 @@ pipeline {
} }
stage('status-go') { stage('status-go') {
steps { sh 'make status-go' } steps {
sh 'make status-go'
}
} }
stage('Package') { stage('Package') {

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.1' library 'status-jenkins-lib@v1.5.6'
pipeline { pipeline {
agent { agent {

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.1' library 'status-jenkins-lib@v1.5.6'
pipeline { pipeline {
agent { agent {
@ -64,12 +64,14 @@ pipeline {
} }
stage('status-go') { stage('status-go') {
steps { sh 'make status-go' } steps {
sh 'make status-go'
}
} }
stage('Package') { stage('Package') {
steps { script { steps { script {
macos.bundle() macos.bundle('pkg-macos')
} } } }
} }

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.1' library 'status-jenkins-lib@v1.5.6'
pipeline { pipeline {
agent { agent {

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.1' library 'status-jenkins-lib@v1.5.6'
pipeline { pipeline {
agent { label 'windows' } agent { label 'windows' }
@ -31,7 +31,7 @@ pipeline {
environment { environment {
TARGET = 'windows' TARGET = 'windows'
/* Improve make performance */ /* Improve make performance */
MAKEFLAGS = "-j4 V=${params.VERBOSE}" MAKEFLAGS = "-j${utils.getProcCount()} V=${params.VERBOSE}"
/* Disable colors in Nim compiler logs */ /* Disable colors in Nim compiler logs */
NIMFLAGS = '--colors:off' NIMFLAGS = '--colors:off'
/* Control output the filename */ /* Control output the filename */
@ -53,7 +53,9 @@ pipeline {
} }
stage('status-go') { stage('status-go') {
steps { sh 'make status-go' } steps {
sh 'make status-go'
}
} }
stage('Package') { stage('Package') {
@ -63,23 +65,29 @@ pipeline {
} }
stage('Parallel Upload') { stage('Parallel Upload') {
/* Uploads on Windows are slow. */
parallel { parallel {
stage('Upload') { stage('Upload 7Z') {
steps { script { steps { script {
zip_url = s3.uploadArtifact(env.STATUS_CLIENT_7Z) zip_url = s3.uploadArtifact(env.STATUS_CLIENT_7Z)
exe_url = s3.uploadArtifact(env.STATUS_CLIENT_EXE)
env.PKG_URL = exe_url
jenkins.setBuildDesc(Zip: zip_url, Exe: exe_url)
} } } }
} }
stage('Archive') { stage('Upload EXE') {
steps { script { steps { script {
archiveArtifacts(env.STATUS_CLIENT_EXE) exe_url = s3.uploadArtifact(env.STATUS_CLIENT_EXE)
archiveArtifacts(env.STATUS_CLIENT_7Z)
} } } }
} }
} }
} }
stage('Archive') {
steps { script {
archiveArtifacts(env.STATUS_CLIENT_EXE)
archiveArtifacts(env.STATUS_CLIENT_7Z)
env.PKG_URL = exe_url
jenkins.setBuildDesc(Zip: zip_url, Exe: exe_url)
} }
}
} }
post { post {
success { script { github.notifyPR(true) } } success { script { github.notifyPR(true) } }

View File

@ -1,4 +1,4 @@
library 'status-jenkins-lib@v1.5.1' library 'status-jenkins-lib@v1.5.6'
pipeline { pipeline {
agent { agent {