diff options
| author | Dmitry Baryshkov <[email protected]> | 2023-12-03 01:13:53 +0300 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2023-12-10 11:47:28 -0800 |
| commit | 236fa3873de8f1d4b0c7eaeb4c53b4d1220d55a0 (patch) | |
| tree | 7eb3368366ee26a8e060a2318a82580c1c330ed4 | |
| parent | a6397e63877e82528c67058e6e6e8d700682df50 (diff) | |
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]>
| -rw-r--r-- | drivers/gpu/drm/ci/build.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh index e5c5dcedd108..ca2923ed2290 100644 --- a/drivers/gpu/drm/ci/build.sh +++ b/drivers/gpu/drm/ci/build.sh @@ -58,6 +58,9 @@ git config --global user.email "[email protected]" 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 |