Update Jenkinsfile

azatsafin · web-flow · commit 25047aefd198 · 2020-12-03T15:46:45.000+03:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -59,15 +59,15 @@ spec:
     stages {
         stage('Checkout release branch') {
             when {
-                expression { return env.GIT_BRANCH == 'master'; }
+                expression { return env.GIT_BRANCH == /.*master$/; }
             }
             steps {
                 sh 'git checkout -b release'
             }
         }
         stage('Merge to release branch') {
             when {
-                expression { return env.GIT_BRANCH == 'master'; }
+                expression { return env.GIT_BRANCH == /.*master$/; }
             }
             steps {
                 sh 'git merge origin/master'
@@ -85,7 +85,7 @@ spec:
         }
         stage('Get version from pom.xml') {
             when {
-                expression { return env.GIT_BRANCH == 'master'; }
+                expression { return env.GIT_BRANCH == /.*master$/; }
             }
             steps {
                 script {

Original file line number	Diff line number	Diff line change
`@@ -59,15 +59,15 @@ spec:`
`59`	`59`	`stages {`
`60`	`60`	`stage('Checkout release branch') {`
`61`	`61`	`when {`
`62`		`- expression { return env.GIT_BRANCH == 'master'; }`
	`62`	`+ expression { return env.GIT_BRANCH == /.*master$/; }`
`63`	`63`	`}`
`64`	`64`	`steps {`
`65`	`65`	`sh 'git checkout -b release'`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`stage('Merge to release branch') {`
`69`	`69`	`when {`
`70`		`- expression { return env.GIT_BRANCH == 'master'; }`
	`70`	`+ expression { return env.GIT_BRANCH == /.*master$/; }`
`71`	`71`	`}`
`72`	`72`	`steps {`
`73`	`73`	`sh 'git merge origin/master'`
`@@ -85,7 +85,7 @@ spec:`
`85`	`85`	`}`
`86`	`86`	`stage('Get version from pom.xml') {`
`87`	`87`	`when {`
`88`		`- expression { return env.GIT_BRANCH == 'master'; }`
	`88`	`+ expression { return env.GIT_BRANCH == /.*master$/; }`
`89`	`89`	`}`
`90`	`90`	`steps {`
`91`	`91`	`script {`