ydeng/rsemcs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Jenkins pipeline now uses default merge message.

Browse Source
This commit is contained in:
Harrison Deng 2022-01-11 01:20:56 -06:00
parent f34cd87308
commit 704692a449
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@ -31,9 +31,8 @@ pipeline {
} }
sh 'git clean -fd' 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 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']) { sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
sh 'git push origin master' sh 'git push origin master'
sh 'git push origin --tags' sh 'git push origin --tags'

2
server_ver.groovy
View File

@ -1,3 +1,3 @@
env.VER_MAJOR=0 env.VER_MAJOR=0
env.VER_MINOR=0 env.VER_MINOR=0
env.VER_PATCH=15 env.VER_PATCH=16