Update sync-fork.yml

Author: jo-chemla

.github/workflows/sync-fork.yml

@@ -7,26 +7,44 @@ on:
   workflow_dispatch:      # manual trigger
 
 jobs:
-  sync-winget-branch:
+  sync-master:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout fork
+      - name: Checkout fork master
         uses: actions/checkout@v4
         with:
-          ref: winget-release-workflow
+          ref: master
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Add upstream
+      - name: Add upstream remote
         run: |
           git remote add upstream https://github.com/libvips/build-win64-mxe.git || true
           git fetch upstream master --tags
 
-      - name: Merge upstream master into winget-release-workflow
+      - name: Hard reset fork master to upstream
         run: |
-          git checkout winget-release-workflow
-          git merge upstream/master --no-edit || echo "No changes to merge"
+          git checkout master
+          git reset --hard upstream/master
+          git push origin master --force
+          git push origin --tags
 
-      - name: Push updates
+  sync-winget-branch:
+    runs-on: ubuntu-latest
+    needs: sync-master
+    steps:
+      - name: Checkout fork branch
+        uses: actions/checkout@v4
+        with:
+          ref: winget-release-workflow
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Add upstream remote
         run: |
-          git push origin winget-release-workflow
-          git push origin --tags
+          git remote add upstream https://github.com/libvips/build-win64-mxe.git || true
+          git fetch upstream master
+
+      - name: Rebase winget-release-workflow on upstream/master
+        run: |
+          git checkout winget-release-workflow
+          git rebase upstream/master || (git rebase --abort && exit 1)
+          git push origin winget-release-workflow --force