Skip to content

Commit 236fa38

Browse files
lumagrobclark
authored andcommitted
drm/ci: remove rebase-merge directory
Gitlab runner can cache git repository, including the unfinished rebase merge status. New CI job will come as a fresh checkout, however this will not destroy the unfinished rebase, failing our build script. Destroy the unfinished rebase state. Suggested-by: David Heidelberg <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Acked-by: Helen Koike <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/570159/ Signed-off-by: Rob Clark <[email protected]>
1 parent a6397e6 commit 236fa38

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/gpu/drm/ci/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ git config --global user.email "[email protected]"
5858
git config --global user.name "freedesktop.org CI"
5959
git config --global pull.rebase true
6060

61+
# cleanup git state on the worker
62+
rm -rf .git/rebase-merge
63+
6164
# Try to merge fixes from target repo
6265
if [ "$(git ls-remote --exit-code --heads ${UPSTREAM_REPO} ${TARGET_BRANCH}-external-fixes)" ]; then
6366
git pull ${UPSTREAM_REPO} ${TARGET_BRANCH}-external-fixes

0 commit comments

Comments
 (0)