Zaktualizuj 'Jenkinsfile'

2020-04-03 09:36:35 +00:00 · 2020-04-03 09:36:35 +00:00 · eeec483d51
commit eeec483d51
parent ddf24768f1
1 changed files with 1 additions and 15 deletions
--- a/16
+++ b/16
@ -1,25 +1,11 @@
 pipeline {
    agent any 
    stages {
-        stage('Stage 1') {
+        stage('Checkout') {
            steps {
                 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.master}"
-			}
-    	}
 	}
 }