ci: workflows: remove rebase-merge folder before rebase

With gitv2.26, git rebase uses "git merge" mechanism instead of "git
apply". This creates a rebase-merge folder in .git, in case of rebase
conflict. This caused problems in self hosted runners due to old
rebase-merge folder. This commit deletes this folder before git rebase
action.

Signed-off-by: Mert Ekren <[email protected]>

Author: mertekren

.github/workflows/bsim-tests.yaml

@@ -77,6 +77,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "Zephyr Bot"
           rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
           git rebase origin/${BASE_REF}
           git clean -f -d
           git log  --pretty=oneline | head -n 10

.github/workflows/clang.yaml

@@ -61,6 +61,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "Zephyr Bot"
           rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
           git rebase origin/${BASE_REF}
           git clean -f -d
           git log  --pretty=oneline | head -n 10

.github/workflows/coding_guidelines.yml

@@ -40,6 +40,8 @@ jobs:
         git config --global user.email "[email protected]"
         git config --global user.name "Github Actions"
         git remote -v
+        rm -fr ".git/rebase-apply"
+        rm -fr ".git/rebase-merge"
         git rebase origin/${BASE_REF}
         git clean -f -d
         source zephyr-env.sh

.github/workflows/compliance.yml

@@ -33,6 +33,8 @@ jobs:
         # Ensure there's no merge commits in the PR
         [[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
         (echo "::error ::Merge commits not allowed, rebase instead";false)
+        rm -fr ".git/rebase-apply"
+        rm -fr ".git/rebase-merge"
         git rebase origin/${BASE_REF}
         git clean -f -d
         # debug

.github/workflows/doc-build.yml

@@ -94,6 +94,8 @@ jobs:
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "Github Actions"
+        rm -fr ".git/rebase-apply"
+        rm -fr ".git/rebase-merge"
         git rebase origin/${BASE_REF}
         git clean -f -d
         git log --graph --oneline HEAD...${PR_HEAD}

.github/workflows/hello_world_multiplatform.yaml

@@ -45,6 +45,8 @@ jobs:
         run: |
           git config --global user.email "[email protected]"
           git config --global user.name "Github Actions"
+          rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
           git rebase origin/${BASE_REF}
           git clean -f -d
           git log --graph --oneline HEAD...${PR_HEAD}

.github/workflows/scripts_tests.yml

@@ -42,6 +42,8 @@ jobs:
         run: |
           git config --global user.email "[email protected]"
           git config --global user.name "Github Actions"
+          rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
           git rebase origin/${BASE_REF}
           git clean -f -d
           git log --graph --oneline HEAD...${PR_HEAD}

.github/workflows/twister-prep.yaml

@@ -67,6 +67,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "Zephyr Bot"
           rm -fr ".git/rebase-apply"
+          rm -fr ".git/rebase-merge"
           git rebase origin/${BASE_REF}
           git clean -f -d
           git log  --pretty=oneline | head -n 10

.github/workflows/twister.yaml

@@ -84,6 +84,7 @@ jobs:
             git config --global user.email "[email protected]"
             git config --global user.name "Zephyr Builder"
             rm -fr ".git/rebase-apply"
+            rm -fr ".git/rebase-merge"
             git rebase origin/${BASE_REF}
             git clean -f -d
             git log  --pretty=oneline | head -n 10