From ba8e43349a7934b2656dc1863f83d11d89977476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 31 May 2024 11:30:50 +0200 Subject: [PATCH] Fix issues when replaying a release build - The release branch is reset to the original state - The local tag is deleted --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6cdcff8f8c..7159878b3d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,9 +30,12 @@ pipeline { } steps { // read version from branch, set it and commit it + sh "git tag -d ${releaseVersion} || true" + sh "git fetch --tags" + sh "git checkout ${env.BRANCH_NAME}" + sh "git reset --hard origin/${env.BRANCH_NAME}" gradle "setVersion -PnewVersion=${releaseVersion}" sh "git add gradle.properties '**.json'" - sh "git checkout ${env.BRANCH_NAME}" commit "Release version ${releaseVersion}" // fetch all remotes from origin