From c8f95cf02287a9fae8ea7111258cc15951f6555b Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Fri, 18 Apr 2025 16:11:13 +0800 Subject: [PATCH] feat(GHA): Renovate auto rebase after PR automerge enabled --- .github/workflows/renovate-rebase.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/renovate-rebase.yaml b/.github/workflows/renovate-rebase.yaml index 59929a7a..91d1044c 100644 --- a/.github/workflows/renovate-rebase.yaml +++ b/.github/workflows/renovate-rebase.yaml @@ -63,7 +63,7 @@ jobs: export TODAY=$( date -u '+%Y-%m-%d_%H-%M-%S' ) export MESSAGE="chore: update ${{ github.event.pull_request.head.ref }} $TODAY" echo "Branch to update: $DESTINATION_BRANCH" - for FILE_TO_COMMIT in $(git diff ${{ github.event.pull_request.head.sha }} HEAD --name-only || git diff --name-only); + for FILE_TO_COMMIT in $(git diff ${{ github.event.pull_request.head.sha }} HEAD --name-only || git diff --name-only --staged || git diff --name-only); do export SHA=$( git rev-parse $DESTINATION_BRANCH:$FILE_TO_COMMIT ) export CONTENT=$( base64 -i $FILE_TO_COMMIT )