Jenkins pipeline now uses default merge message.
This commit is contained in:
parent
f34cd87308
commit
704692a449
3
Jenkinsfile
vendored
3
Jenkinsfile
vendored
@ -31,9 +31,8 @@ pipeline {
|
||||
}
|
||||
sh 'git clean -fd'
|
||||
|
||||
sh 'git merge --strategy-option theirs --no-commit origin/delta'
|
||||
sh 'git merge --strategy-option theirs origin/delta'
|
||||
sh 'git tag -a "L$VER_MAJOR.$VER_MINOR.$VER_PATCH" -m "Automatic publish performed by Jenkins."'
|
||||
sh 'git commit -am "Automatically merged delta branch to master." || exit 0'
|
||||
sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
|
||||
sh 'git push origin master'
|
||||
sh 'git push origin --tags'
|
||||
|
@ -1,3 +1,3 @@
|
||||
env.VER_MAJOR=0
|
||||
env.VER_MINOR=0
|
||||
env.VER_PATCH=15
|
||||
env.VER_PATCH=16
|
||||
|
Loading…
Reference in New Issue
Block a user