Merge branch 'develop' into issue-13832

status-im · Sep 15, 2022 · 6d71bc7 · 6d71bc7
2 parents 9e5b89a + 38bbf84
commit 6d71bc7
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 21 deletions.
diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.3'
+library 'status-jenkins-lib@v1.5.5'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -49,10 +49,9 @@ pipeline {
     stage('Prep') {
       steps {
         script {
-          btype = utils.getBuildType()
-          print "Running ${btype} build!"
-          /* Cleanup and Prep */
-          commonPrep(btype)
+          utils.doGitRebasePR()
+          utils.symlinkEnv()
+          println("Build Number: ${utils.genBuildNumber()}")
         }
       }
     }

diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.3'
+library 'status-jenkins-lib@v1.5.5'
 
 pipeline {
   agent { label 'linux' }
@@ -33,7 +33,7 @@ pipeline {
   stages {
     stage('Prep') {
       steps { script {
-        println "Current JOB: ${env.JOB_NAME}"
+        println("Current JOB: ${env.JOB_NAME}")
         /* just for a shorter access */
         btype = utils.getBuildType()
       } }

diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.3'
+library 'status-jenkins-lib@v1.5.5'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -48,10 +48,9 @@ pipeline {
     stage('Prep') {
       steps {
         script {
-          btype = utils.getBuildType()
-          print "Running ${btype} build!"
-          /* Cleanup and Prep */
-          commonPrep(btype)
+          utils.doGitRebasePR()
+          utils.symlinkEnv()
+          println("Build Number: ${utils.genBuildNumber()}")
         }
       }
     }

diff --git a/ci/Jenkinsfile.nix-cache b/ci/Jenkinsfile.nix-cache
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.3'
+library 'status-jenkins-lib@v1.5.5'
 
 pipeline {
   agent { label params.AGENT_LABEL }

diff --git a/ci/Jenkinsfile.tests b/ci/Jenkinsfile.tests
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.0'
+library 'status-jenkins-lib@v1.5.5'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -44,10 +44,7 @@ pipeline {
     stage('Prep') {
       steps {
         script {
-          btype = utils.getBuildType()
-          print "Running ${btype} build!"
-          /* Cleanup and Prep */
-          commonPrep(btype)
+          utils.doGitRebasePR()
         }
       }
     }

diff --git a/ci/tests/Jenkinsfile.e2e-prs b/ci/tests/Jenkinsfile.e2e-prs
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.3'
+library 'status-jenkins-lib@v1.5.5'
 
 pipeline {
 

diff --git a/ci/tools/Jenkinsfile.fastlane-clean b/ci/tools/Jenkinsfile.fastlane-clean
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.3'
+library 'status-jenkins-lib@v1.5.5'
 
 pipeline {
   agent { label 'macos' }

diff --git a/ci/tools/Jenkinsfile.playstore-meta b/ci/tools/Jenkinsfile.playstore-meta
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.3'
+library 'status-jenkins-lib@v1.5.5'
 
 pipeline {
   agent { label 'linux' }