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 <david.heidelberg@collabora.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Acked-by: Helen Koike <helen.koike@collabora.com> Patchwork: https://patchwork.freedesktop.org/patch/570159/ Signed-off-by: Rob Clark <robdclark@chromium.org>
This commit is contained in:
committed by
Rob Clark
parent
a6397e6387
commit
236fa3873d
@@ -58,6 +58,9 @@ git config --global user.email "fdo@example.com"
|
||||
git config --global user.name "freedesktop.org CI"
|
||||
git config --global pull.rebase true
|
||||
|
||||
# cleanup git state on the worker
|
||||
rm -rf .git/rebase-merge
|
||||
|
||||
# Try to merge fixes from target repo
|
||||
if [ "$(git ls-remote --exit-code --heads ${UPSTREAM_REPO} ${TARGET_BRANCH}-external-fixes)" ]; then
|
||||
git pull ${UPSTREAM_REPO} ${TARGET_BRANCH}-external-fixes
|
||||
|
||||
Reference in New Issue
Block a user