Update sync-fork.yml, only standard git ops

Author: jo-chemla

.github/workflows/sync-fork.yml

@@ -1,48 +1,32 @@
-name: Sync Fork with Upstream
+name: Sync winget-release-workflow fork branch with upstream master
 # Default branch set to winget-release-workflow rather than master so action can run, and changes only occur in that branch so master is synced. 
 
 on:
   schedule:
-    - cron: '15 * * * *'  # daily at 03:00 UTC
-  workflow_dispatch:
+    - cron: '0 3 * * *'  # once per day at 03:00 UTC
+  workflow_dispatch:      # manual trigger
 
 jobs:
-  sync-master:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: tgymnich/[email protected]
-        with:
-          owner: libvips
-          repo: build-win64-mxe
-          base: master
-          head: master
-          merge_method: merge
-
   sync-winget-branch:
     runs-on: ubuntu-latest
     steps:
-      - uses: tgymnich/[email protected]
-        with:
-          owner: libvips
-          repo: build-win64-mxe
-          base: master
-          head: winget-release-workflow
-          merge_method: merge
-          auto_approve: true 
-          auto_merge: true
-          ignore_fail: false
-
-  sync-tags:
-    runs-on: ubuntu-latest
-    needs: [sync-master, sync-winget-branch]
-    steps:
-      - name: Checkout winget-release-workflow
+      - name: Checkout fork
         uses: actions/checkout@v4
         with:
           ref: winget-release-workflow
-      - name: Fetch upstream tags
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Add upstream
         run: |
           git remote add upstream https://github.com/libvips/build-win64-mxe.git || true
-          git fetch upstream --tags
-      - name: Push tags to fork
-        run: git push origin --tags
+          git fetch upstream master --tags
+
+      - name: Merge upstream master into winget-release-workflow
+        run: |
+          git checkout winget-release-workflow
+          git merge upstream/master --no-edit || echo "No changes to merge"
+
+      - name: Push updates
+        run: |
+          git push origin winget-release-workflow
+          git push origin --tags