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:
René Pfeuffer
2020-04-09 21:07:54 +02:00
parent d5847e7965
commit 80b843d0bf

1
Jenkinsfile vendored
View File

@@ -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