Update update-feature-branches.yaml

Carvin-Yu · Jan 7, 2024 · 196a826 · 196a826
1 parent 2922f84
commit 196a826
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/.github/workflows/update-feature-branches.yaml b/.github/workflows/update-feature-branches.yaml
@@ -22,16 +22,14 @@ jobs:
         run: |
           git fetch --unshallow
           git pull
-          for branch in $(git branch -r --list "origin/feature/*"); do
-            branch_name=$(echo $branch | sed 's/origin\///')
-            git checkout -B $branch_name $branch
-            git pull
-            git merge main
-            if [ $? -ne 0 ]; then
-                git merge --abort
-                git reset --hard HEAD
-            fi
-            git push origin $branch_name
+          if git merge main --no-commit; then
+              git commit -m "Merge main into $branch_name"
+              git push origin $branch_name
+          else
+              git merge --abort
+              git reset --hard HEAD
+              continue
+          fi
           done