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

Commit 03ffd4f

Browse files
committed
CI: clean repo before updating master branch
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.
1 parent ab4e6ca commit 03ffd4f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Jenkinsfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,8 @@ pipeline {
306306
// All tests have passed on the "devel" branch, we can now fast-forward "master" to it.
307307
sh '''
308308
head=$(git rev-parse HEAD) &&
309+
git diff &&
310+
git reset --hard &&
309311
git fetch origin master &&
310312
git checkout FETCH_HEAD &&
311313
git merge --ff-only $head &&

0 commit comments

Comments
 (0)