Update backup.yml

Author: LostSunset

.github/workflows/backup.yml

@@ -2,75 +2,78 @@ name: Backup Fork and Sync
 
 on:
   schedule:
-    - cron: '0 0 * * 0'  # 每週日午夜運行一次
+    - cron: '0 0 * * 0'  # 每週日午夜執行
   workflow_dispatch:  # 允許手動觸發
 
+env:
+  UPSTREAM_REPO: ${{ vars.UPSTREAM_REPO || 'https://github.com/CMU-Perceptual-Computing-Lab/openpose.git' }}
+  MAIN_BRANCH: ${{ vars.MAIN_BRANCH || 'master' }}
+
 jobs:
   backup-and-sync:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0  # 獲取所有歷史記錄和標籤
-          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+          token: ${{ secrets.PAT_TOKEN }}
 
       - name: Configure Git
         run: |
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          git config --global checkout.defaultRemote origin
+
+      - name: Tag current state
+        run: |
+          TIMESTAMP=$(date +"%Y%m%d%H%M%S")
+          git tag -a "pre-sync-$TIMESTAMP" -m "Pre-sync state on $TIMESTAMP"
+          git push origin "pre-sync-$TIMESTAMP"
 
       - name: Add upstream repository
         run: |
-          git remote add upstream https://github.com/CMU-Perceptual-Computing-Lab/openpose.git
+          git remote add upstream ${{ env.UPSTREAM_REPO }} || git remote set-url upstream ${{ env.UPSTREAM_REPO }}
           git fetch --all --tags
 
       - name: Sync and handle conflicts
         run: |
-          # 獲取所有本地分支
           branches=$(git branch -r | grep 'origin/' | grep -v 'origin/HEAD' | sed 's/origin\///')
           
           for branch in $branches; do
             echo "Processing branch: $branch"
             
-            # 檢查分支是否存在於上游
             if git ls-remote --exit-code --heads upstream $branch > /dev/null 2>&1; then
-              # 切換到分支
               git checkout -B $branch origin/$branch
               
-              # 嘗試合併上游更改
-              if git merge upstream/$branch --no-edit; then
+              echo "Changes in upstream $branch:"
+              git log --oneline $branch..upstream/$branch
+              
+              if git merge upstream/$branch --no-edit --allow-unrelated-histories; then
                 echo "Successfully merged changes for $branch"
-                git push origin $branch
               else
-                echo "Merge conflict in $branch. Attempting automatic resolution..."
-                
-                # 嘗試自動解決衝突
-                git diff --name-only --diff-filter=U | xargs git checkout --theirs
-                git add .
-                git commit -m "Auto-resolve conflicts in $branch"
-                
-                # 推送更改
-                if git push origin $branch; then
-                  echo "Pushed auto-resolved changes for $branch"
-                else
-                  echo "Failed to push changes for $branch. Manual intervention required."
-                  git merge --abort
-                fi
+                echo "Merge conflict in $branch. Creating a new branch with upstream changes."
+                git merge --abort
+                conflict_branch="${branch}-upstream-changes"
+                git checkout -b $conflict_branch upstream/$branch
+                echo "Created new branch $conflict_branch with upstream changes"
+                git push origin $conflict_branch
+                echo "Please manually review and merge changes from $conflict_branch into $branch"
+                git checkout $branch
               fi
+              git push origin $branch || echo "Failed to push $branch, please check and push manually if needed"
             else
               echo "Branch $branch does not exist in upstream. Skipping."
             fi
           done
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Create version tag
+      - name: Create post-sync version tag
         run: |
           TIMESTAMP=$(date +"%Y%m%d%H%M%S")
-          git tag -a "sync-$TIMESTAMP" -m "Sync on $TIMESTAMP"
-          git push --tags origin
+          git tag -a "post-sync-$TIMESTAMP" -m "Post-sync state on $TIMESTAMP"
+          git push origin "post-sync-$TIMESTAMP"
 
       - name: Generate sync report
         if: always()
@@ -81,7 +84,7 @@ jobs:
           git branch -r | grep 'origin/' | grep -v 'origin/HEAD' | sed 's/origin\///' | while read branch; do
             echo "## Branch: $branch" >> sync_report.md
             if git log HEAD..origin/$branch --oneline | grep -q .; then
-              echo "Status: Changes pushed" >> sync_report.md
+              echo "Status: Changes synced" >> sync_report.md
               echo "Changes:" >> sync_report.md
               git log HEAD..origin/$branch --oneline >> sync_report.md
             else
@@ -92,7 +95,7 @@ jobs:
 
       - name: Upload sync report
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: sync-report
           path: sync_report.md