Update process-apps.yml

2026-01-17 17:47:57 +08:00 · 2024-11-28 23:38:45 +08:00
parent 51143730c1
commit f712f51108
1 changed files with 5 additions and 2 deletions
@@ -44,7 +44,10 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: |
          git fetch origin custom
-          git rebase origin/custom
+
          git add .
-          git diff --cached --quiet && echo "No changes to commit" || git commit -m "Processed apps directory via GitHub Actions"
+          git diff --cached --quiet || git commit -m "Processed apps directory via GitHub Actions"
+
+          git rebase origin/custom || { echo "Rebase failed, trying to resolve"; git rebase --abort; git pull --rebase origin custom; }
+
          git push origin custom