Rewrite the upstream syncup job [3]

Author: jbachorik

.github/workflows/dd-sync.yml

@@ -7,7 +7,6 @@ on:
 permissions:           # minimum perms the job needs
   contents: write      # push the sync branch
   pull-requests: write # open, approve & merge the PR
-  actions: write       # update workflow files
 
 concurrency:           # never let two syncs race
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -22,34 +21,90 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       # 2. fetch upstream & copy it to a side branch
       - name: Update upstream-sync branch
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          # Configure git identity
+          git config --global user.email "[email protected]"
+          git config --global user.name "GitHub Action"
+          
           git remote add upstream https://github.com/openjdk/jdk17u-dev.git
           git fetch upstream master
-          git checkout -B upstream-sync upstream/master
+          
+          echo "=== Current branch status ==="
+          git log --oneline -5
+          echo "=== Upstream status ==="
+          git log --oneline -5 upstream/master
+          
+          # Create sync branch from current master to preserve workflows
+          git checkout -B upstream-sync origin/master
+          
+          echo "=== About to merge upstream changes ==="
+          git log --oneline -1 HEAD
+          git log --oneline -1 upstream/master
+          
+          # Simple merge approach - let's see what happens
+          if git merge upstream/master --no-edit --allow-unrelated-histories; then
+            echo "=== Merge successful ==="
+            git log --oneline -5
+          else
+            echo "=== Merge failed, trying alternative approach ==="
+            git merge --abort || true
+            git reset --hard upstream/master
+            # Restore our workflow files after taking upstream
+            git checkout origin/master -- .github/workflows/
+            git add .github/workflows/
+            git commit -m "Preserve local workflow files during upstream sync"
+            echo "=== Alternative approach completed ==="
+            git log --oneline -5
+          fi
+          
+          echo "=== Final branch status before push ==="
+          git log --oneline -10
           git push -f origin upstream-sync
 
       # 3. Open or update the PR `upstream-sync -> master`
-      - uses: peter-evans/create-pull-request@v7
-        id: cpr
-        with:
-          branch: upstream-sync
-          base:   master
-          title:  "Automated upstream merge"
-          body:   "Nightly sync of openjdk/jdk:master into this fork"
+      - name: Create or update pull request
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Check if PR already exists
+          PR_NUMBER=$(gh pr list --head upstream-sync --base master --json number --jq '.[0].number' || echo "")
+          
+          if [ -n "$PR_NUMBER" ]; then
+            echo "PR #$PR_NUMBER already exists, updating it"
+            gh pr edit $PR_NUMBER --title "Automated upstream merge" --body "Nightly sync of openjdk/jdk17u-dev:master into this fork"
+          else
+            echo "Creating new PR"
+            PR_NUMBER=$(gh pr create --head upstream-sync --base master --title "Automated upstream merge" --body "Nightly sync of openjdk/jdk17u-dev:master into this fork" --json number --jq '.number')
+            echo "Created PR #$PR_NUMBER"
+          fi
+          
+          echo "pr-number=$PR_NUMBER" >> $GITHUB_OUTPUT
 
       # 4. Auto-approve that PR
-      - if: steps.cpr.outputs.pull-request-operation != 'none'
-        uses: hmarr/auto-approve-action@v4
-        with:
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
+      - name: Auto-approve PR
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_NUMBER=$(gh pr list --head upstream-sync --base master --json number --jq '.[0].number')
+          if [ -n "$PR_NUMBER" ]; then
+            gh pr review $PR_NUMBER --approve --body "Auto-approved upstream sync"
+            echo "Approved PR #$PR_NUMBER"
+          fi
 
       # 5. Enable auto-merge so GitHub merges as soon as
       #    branch protection requirements are satisfied
-      - if: steps.cpr.outputs.pull-request-operation == 'created'
-        uses: peter-evans/enable-pull-request-automerge@v3
-        with:
-          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
-          merge-method: merge
+      - name: Enable auto-merge
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_NUMBER=$(gh pr list --head upstream-sync --base master --json number --jq '.[0].number')
+          if [ -n "$PR_NUMBER" ]; then
+            gh pr merge $PR_NUMBER --auto --merge
+            echo "Enabled auto-merge for PR #$PR_NUMBER"
+          fi