From 6b91509df54261c6aba074e4102cec2255b93043 Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Fri, 18 Apr 2025 17:16:27 +0800
Subject: [PATCH] feat(GHA): Renovate auto rebase after PR automerge enabled

---
 .github/workflows/renovate-rebase.yaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/renovate-rebase.yaml b/.github/workflows/renovate-rebase.yaml
index 4d3b4e90..2174d2b2 100644
--- a/.github/workflows/renovate-rebase.yaml
+++ b/.github/workflows/renovate-rebase.yaml
@@ -35,17 +35,17 @@ jobs:
           private-key: "${{ secrets.BOT_JWT_PRIVATE_KEY }}" # $BOT_JWT_PRIVATE_KEY is generated in GitHub App main settings page, uses the X.509 private key format
           owner: "${{ github.repository_owner }}"
 
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          token: "${{ steps.oauth-token.outputs.token }}"
-          repository: "${{ github.event.pull_request.base.repo.full_name }}"
-          ref: "main"
-          fetch-depth: 1
-
-      - name: Get latest SHA
-        run: |
-          echo "LATEST_MAIN_SHA=$(git rev-parse HEAD)" >> "${GITHUB_ENV}"
+      # - name: Checkout
+      #   uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      #   with:
+      #     token: "${{ steps.oauth-token.outputs.token }}"
+      #     repository: "${{ github.event.pull_request.base.repo.full_name }}"
+      #     ref: "main"
+      #     fetch-depth: 1
+      #
+      # - name: Get latest SHA
+      #   run: |
+      #     echo "LATEST_MAIN_SHA=$(git rev-parse HEAD)" >> "${GITHUB_ENV}"
 
       - name: Update branch
         env:
@@ -53,7 +53,7 @@ jobs:
         shell: bash
         run: |
           gh api --method PUT /repos/${{ github.event.pull_request.base.repo.full_name }}/pulls/${{ github.event.pull_request.number }}/update-branch \
-             --field expected_head_sha=${{ env.LATEST_MAIN_SHA }}
+             --field expected_head_sha=${{ github.event.pull_request.head.sha }}
 
       #
       # - name: Git