Automatically merged delta branch to master.
This commit is contained in:
		
							
								
								
									
										22
									
								
								Jenkinsfile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										22
									
								
								Jenkinsfile
									
									
									
									
										vendored
									
									
								
							@@ -19,6 +19,17 @@ pipeline {
 | 
			
		||||
                sh 'git reset --hard'
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        stage('update') {
 | 
			
		||||
            steps {
 | 
			
		||||
                load './server_ver.groovy'
 | 
			
		||||
                sh 'git checkout delta'
 | 
			
		||||
                sh 'sed -i "s/env.VER_PATCH=$VER_PATCH/env.VER_PATCH=$((VER_PATCH + 1))/" ./server_ver.groovy'
 | 
			
		||||
                sh 'git commit -am "Updated version number for next patch."'
 | 
			
		||||
                sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
 | 
			
		||||
                    sh 'git push origin delta'
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        stage('queue') {
 | 
			
		||||
            steps {
 | 
			
		||||
                load './server_ver.groovy'
 | 
			
		||||
@@ -39,16 +50,5 @@ pipeline {
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        stage('update') {
 | 
			
		||||
            steps {
 | 
			
		||||
                load './server_ver.groovy'
 | 
			
		||||
                sh 'git checkout delta'
 | 
			
		||||
                sh 'sed -i "s/env.VER_PATCH=$VER_PATCH/env.VER_PATCH=$((VER_PATCH + 1))/" ./server_ver.groovy'
 | 
			
		||||
                sh 'git commit -am "Updated version number for next patch."'
 | 
			
		||||
                sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
 | 
			
		||||
                    sh 'git push origin delta'
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,3 @@
 | 
			
		||||
env.VER_MAJOR=0
 | 
			
		||||
env.VER_MINOR=0
 | 
			
		||||
env.VER_PATCH=9
 | 
			
		||||
env.VER_PATCH=10
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user