From 3d9bf3a1e7d1e98e7023d93b358b50782ba3e884 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Thu, 19 Dec 2024 09:31:06 +0100
Subject: [PATCH] OZG-7324 adjust branch name: master -> main
---
Jenkinsfile | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index bd967d0..c0713c0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -67,7 +67,7 @@ pipeline {
when {
not {
anyOf {
- branch 'master'
+ branch 'main'
branch 'release'
}
}
@@ -94,7 +94,7 @@ pipeline {
sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -P ci-build clean install -Dmaven.wagon.http.retryHandler.count=3'
script {
- if (env.BRANCH_NAME == 'master') {
+ if (isMainBranch()) {
withSonarQubeEnv('sonarqube-ozg-sh'){
sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
}
@@ -143,7 +143,7 @@ pipeline {
// stage('Deploy FormCycle Plugin to FC-server') {
// when {
// anyOf {
-// branch 'master'
+// branch 'main'
// }
// }
//
@@ -225,4 +225,8 @@ String getPomVersion(String pomFile){
def pom = readMavenPom file: pomFile
return pom.version
+}
+
+Boolean isMainBranch() {
+ return env.BRANCH_NAME == 'main'
}
\ No newline at end of file
--
GitLab