Zaktualizuj 'Jenkinsfile'

2020-04-03 09:31:01 +00:00 · 2020-04-03 09:31:01 +00:00 · d1473369df
commit d1473369df
parent 2405922822
1 changed files with 15 additions and 1 deletions
--- a/16
+++ b/16
@ -3,8 +3,22 @@ pipeline {
    stages {
        stage('Stage 1') {
            steps {
-                echo 'Hello world!' 
+                 sh "git checkout -f ${env.master}"
+
            }
        }
+		stage('Merge with master') {
+      		when {
+        		not {
+          			branch 'master'
+        		}
+			}    
+      		agent {
+        		label "master"
+      		}    
+      steps {
+        sh 'git checkout -f origin/master'
+        sh "git merge --ff-only ${env.BRANCH_NAME}"
+      }
    }
 }