mirror of
https://github.com/scm-manager/scm-manager.git
synced 2026-01-05 07:09:48 +01:00
Reset to original master branch
In case the master branch had been checked out before with a different commit from an earlier build, we reset it to the commit from origin.
This commit is contained in:
1
Jenkinsfile
vendored
1
Jenkinsfile
vendored
@@ -53,6 +53,7 @@ node('docker') {
|
||||
|
||||
// merge release branch into master
|
||||
sh "git checkout master"
|
||||
sh "git reset --hard origin/master"
|
||||
sh "git merge --ff-only ${env.BRANCH_NAME}"
|
||||
|
||||
// set tag
|
||||
|
||||
Reference in New Issue
Block a user