ci(jenkins): allow releasing from release-branches

Lundalogik · Sep 10, 2019 · 76b6340 · 76b6340
1 parent d9205e4
commit 76b6340
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -72,14 +72,14 @@ pipeline {
             }
             steps {
                 script {
-                    if (env.BRANCH_NAME == 'master') {
-                        echo 'On master. Running release step.'
+                    if (env.BRANCH_NAME == 'master' || (env.BRANCH_NAME.length() > 8 && env.BRANCH_NAME.substring(0,8) == 'release-')) {
+                        echo 'On master or release-branch. Running release step.'
                         sh 'make release'
                     } else if (env.BRANCH_NAME.substring(0,3) == 'PR-') {
                         echo 'On PR branch. Running release step in dry-run mode.'
                         sh "make release_dry_run BRANCH=${env.BRANCH_NAME}"
                     } else {
-                        echo('Not on master nor a PR branch. Skipping release step.')
+                        echo('Unknown branch type. Skipping release step.')
                     }
                 }
             }