Jenkins pipeline will use auto generated merge commit now.

2022-01-10 03:57:25 -06:00
parent c8c2ef1803
commit d3b84a8f77
1 changed files with 1 additions and 2 deletions
--- a/3
+++ b/3
@@ -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'