Skip to content
This repository has been archived by the owner on Oct 22, 2024. It is now read-only.

Commit

Permalink
CI: clean repo before updating master branch
Browse files Browse the repository at this point in the history
This recently failed:

+ git checkout FETCH_HEAD
11:46:08.046  error: Your local changes to the following files would be overwritten by checkout:
11:46:08.046  	deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml
11:46:08.046  Please commit your changes or stash them before you switch branches.

It's not clear what those changes where (file seems to be up-to-date). "git
diff" will clarify this. But probably the local changes can be ignored.
  • Loading branch information
pohly committed Sep 23, 2022
1 parent ab4e6ca commit 03ffd4f
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,8 @@ pipeline {
// All tests have passed on the "devel" branch, we can now fast-forward "master" to it.
sh '''
head=$(git rev-parse HEAD) &&
git diff &&
git reset --hard &&
git fetch origin master &&
git checkout FETCH_HEAD &&
git merge --ff-only $head &&
Expand Down

0 comments on commit 03ffd4f

Please sign in to comment.