try again

nicolatimeus · web-flow · commit 173737cec53d · 2025-03-31T17:49:26.000+02:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,8 +25,7 @@ node {
 
     stage('Preparation') {
         dir("kura") {
-            def scmResult = checkout scm
-            env.GIT_BRANCH = scmResult.GIT_BRANCH
+            checkout scm
             sh "touch /tmp/isJenkins.txt"
         }
     }
@@ -39,9 +38,9 @@ node {
     }
 
 
-    echo "Current branch is \"${env.GIT_BRANCH}\", primary: ${env.BRANCH_IS_PRIMARY}"
+    echo "Current branch is \"${scm.branches[0].name}\", primary: ${env.BRANCH_IS_PRIMARY}"
     def buildType = 'install'
-    if (env.BRANCH_IS_PRIMARY && 'develop'.equals(scmResult.GIT_BRANCH)) {
+    if (env.BRANCH_IS_PRIMARY && 'develop'.equals(scm.branches[0].name)) {
         echo "Using deploy target"
         buildType = 'deploy'
     } else {

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,7 @@ node {`
`25`	`25`
`26`	`26`	`stage('Preparation') {`
`27`	`27`	`dir("kura") {`
`28`		`- def scmResult = checkout scm`
`29`		`- env.GIT_BRANCH = scmResult.GIT_BRANCH`
	`28`	`+ checkout scm`
`30`	`29`	`sh "touch /tmp/isJenkins.txt"`
`31`	`30`	`}`
`32`	`31`	`}`
`@@ -39,9 +38,9 @@ node {`
`39`	`38`	`}`
`40`	`39`
`41`	`40`
`42`		`- echo "Current branch is \"${env.GIT_BRANCH}\", primary: ${env.BRANCH_IS_PRIMARY}"`
	`41`	`+ echo "Current branch is \"${scm.branches[0].name}\", primary: ${env.BRANCH_IS_PRIMARY}"`
`43`	`42`	`def buildType = 'install'`
`44`		`- if (env.BRANCH_IS_PRIMARY && 'develop'.equals(scmResult.GIT_BRANCH)) {`
	`43`	`+ if (env.BRANCH_IS_PRIMARY && 'develop'.equals(scm.branches[0].name)) {`
`45`	`44`	`echo "Using deploy target"`
`46`	`45`	`buildType = 'deploy'`
`47`	`46`	`} else {`