From 7e47057b2ecc2bba8ea1807089c9ae58806bf52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 17 May 2023 17:57:24 +0200 Subject: [PATCH] ci: drop useless call to doGitRebasePR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It only blocks CI builds for no good reason when branch has not been rebased recently, which has no real benefit as GitHub already enforces not merging outdated PRs. It's just annoying and wastes time. Depends on: https://github.com/status-im/status-jenkins-lib/pull/68 Signed-off-by: Jakub SokoĊ‚owski --- ci/Jenkinsfile.android | 3 +-- ci/Jenkinsfile.combined | 2 +- ci/Jenkinsfile.ios | 3 +-- ci/Jenkinsfile.nix-cache | 2 +- ci/Jenkinsfile.tests | 9 +-------- ci/tests/Jenkinsfile.e2e-nightly | 2 +- ci/tests/Jenkinsfile.e2e-prs | 2 +- ci/tests/Jenkinsfile.e2e-upgrade | 2 +- ci/tools/Jenkinsfile.fastlane-clean | 2 +- ci/tools/Jenkinsfile.playstore-meta | 2 +- ci/tools/Jenkinsfile.xcode-clean | 2 +- 11 files changed, 11 insertions(+), 20 deletions(-) diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android index fdd647c5c0..297762ac69 100644 --- a/ci/Jenkinsfile.android +++ b/ci/Jenkinsfile.android @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.7.7' +library 'status-jenkins-lib@v1.7.8' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() @@ -49,7 +49,6 @@ pipeline { stage('Prep') { steps { script { - utils.doGitRebasePR() utils.symlinkEnv() println("Build Number: ${utils.genBuildNumber()}") } diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined index ddfc7e629f..ca84009477 100644 --- a/ci/Jenkinsfile.combined +++ b/ci/Jenkinsfile.combined @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.7.7' +library 'status-jenkins-lib@v1.7.8' pipeline { agent { label 'linux' } diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index 0e2a081b51..5a5deab523 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.7.7' +library 'status-jenkins-lib@v1.7.8' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() @@ -48,7 +48,6 @@ pipeline { stage('Prep') { steps { script { - utils.doGitRebasePR() utils.symlinkEnv() println("Build Number: ${utils.genBuildNumber()}") } diff --git a/ci/Jenkinsfile.nix-cache b/ci/Jenkinsfile.nix-cache index 79edad6ed7..3b84a5c640 100644 --- a/ci/Jenkinsfile.nix-cache +++ b/ci/Jenkinsfile.nix-cache @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.7.7' +library 'status-jenkins-lib@v1.7.8' pipeline { agent { label params.AGENT_LABEL } diff --git a/ci/Jenkinsfile.tests b/ci/Jenkinsfile.tests index a1745e0047..318cd3ceb8 100644 --- a/ci/Jenkinsfile.tests +++ b/ci/Jenkinsfile.tests @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.7.7' +library 'status-jenkins-lib@v1.7.8' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() @@ -41,13 +41,6 @@ pipeline { } stages { - stage('Prep') { - steps { - script { - utils.doGitRebasePR() - } - } - } stage('Checks') { parallel { stage('Lint') { diff --git a/ci/tests/Jenkinsfile.e2e-nightly b/ci/tests/Jenkinsfile.e2e-nightly index aa5ee39341..6082eb43c4 100644 --- a/ci/tests/Jenkinsfile.e2e-nightly +++ b/ci/tests/Jenkinsfile.e2e-nightly @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.7.7' +library 'status-jenkins-lib@v1.7.8' pipeline { diff --git a/ci/tests/Jenkinsfile.e2e-prs b/ci/tests/Jenkinsfile.e2e-prs index 22c321125e..638d39f6c9 100644 --- a/ci/tests/Jenkinsfile.e2e-prs +++ b/ci/tests/Jenkinsfile.e2e-prs @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.7.7' +library 'status-jenkins-lib@v1.7.8' pipeline { diff --git a/ci/tests/Jenkinsfile.e2e-upgrade b/ci/tests/Jenkinsfile.e2e-upgrade index 79411b3342..64b3108aaf 100644 --- a/ci/tests/Jenkinsfile.e2e-upgrade +++ b/ci/tests/Jenkinsfile.e2e-upgrade @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.7.7' +library 'status-jenkins-lib@v1.7.8' pipeline { diff --git a/ci/tools/Jenkinsfile.fastlane-clean b/ci/tools/Jenkinsfile.fastlane-clean index 1b782c350c..c633e9b85b 100644 --- a/ci/tools/Jenkinsfile.fastlane-clean +++ b/ci/tools/Jenkinsfile.fastlane-clean @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.7.7' +library 'status-jenkins-lib@v1.7.8' pipeline { agent { label 'macos' } diff --git a/ci/tools/Jenkinsfile.playstore-meta b/ci/tools/Jenkinsfile.playstore-meta index a79ccd1791..b39108554e 100644 --- a/ci/tools/Jenkinsfile.playstore-meta +++ b/ci/tools/Jenkinsfile.playstore-meta @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.7.7' +library 'status-jenkins-lib@v1.7.8' pipeline { agent { label 'linux' } diff --git a/ci/tools/Jenkinsfile.xcode-clean b/ci/tools/Jenkinsfile.xcode-clean index 052c4ed16e..0ae05ff855 100644 --- a/ci/tools/Jenkinsfile.xcode-clean +++ b/ci/tools/Jenkinsfile.xcode-clean @@ -1,4 +1,4 @@ -library 'status-jenkins-lib@v1.7.7' +library 'status-jenkins-lib@v1.7.8' pipeline { agent {