From 957adc010a2256029ac28f98d836eb297999dadc Mon Sep 17 00:00:00 2001
From: Chong Wei Hon <c.weihon@gmail.com>
Date: Wed, 24 Sep 2025 18:43:55 +0800
Subject: [PATCH] Update sync-upstream.yml

Bug fix for not able to run upstream sync
---
 .github/workflows/sync-upstream.yml | 42 ++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml
index ff651a8..9e3154a 100644
--- a/.github/workflows/sync-upstream.yml
+++ b/.github/workflows/sync-upstream.yml
@@ -1,17 +1,45 @@
-name: Sync Fork
+name: Upstream Sync
 
 on:
   schedule:
-    - cron: '0 */6 * * *'
+    - cron: "0 */6 * * *" # run every 6 hours
   workflow_dispatch:
 
+permissions:
+  contents: write
+  actions: write
+
 jobs:
-  sync:
+  sync_latest_from_upstream:
+    name: Sync latest commits from upstream repo
     runs-on: ubuntu-latest
+    if: ${{ github.event.repository.fork }}
+
     steps:
+      # Step 1: run a standard checkout action
+      - name: Checkout target repo
+        uses: actions/checkout@v4
+
+      # Step 2: run the sync action
       - name: Sync upstream changes
-        uses: dabreadman/fork-sync-with-upstream-action@v1
+        id: sync
+        uses: aormsby/Fork-Sync-With-Upstream-action@v3.4.1
         with:
-          upstream_repository: https://github.com/djteang/OrangeTV
-          target_branch: main
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          upstream_sync_repo: djteang/OrangeTV
+          upstream_sync_branch: main
+          target_sync_branch: main
+          target_repo_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Sync check
+        if: failure()
+        run: |
+          echo "[Error] Due to a change in the workflow file of the upstream repository, GitHub has automatically suspended the scheduled automatic update. You need to manually sync your fork."
+          exit 1
+
+      - name: Delete workflow runs
+        uses: Mattraks/delete-workflow-runs@main
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          repository: ${{ github.repository }}
+          retain_days: 0
+          keep_minimum_runs: 2