From 873dc369bf4cc042c5b9fdccf12898a3564a73d1 Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Fri, 18 Apr 2025 15:11:24 +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 871672dd..9b1f9f27 100644 --- a/.github/workflows/renovate-rebase.yaml +++ b/.github/workflows/renovate-rebase.yaml @@ -49,7 +49,7 @@ jobs: git config user.name "${{ secrets.BOT_USERNAME }}[bot]" git config user.email "${{ secrets.BOT_USERNAME }} <${{ secrets.BOT_API_ID }}+${{ secrets.BOT_USERNAME }}[bot]@users.noreply.github.com>" # get $BOT_API_ID from `curl -s 'https://api.github.com/users/$(BOT_USERNAME)%5Bbot%5D' | yq .id` # echo "CURRENT_PR_SHA=$(git rev-parse --verify HEAD)" >> "${GITHUB_ENV}" - git remote add upstream ${{ github.event.pull_request.base.repo.url }} + git remote add upstream https://github.com/${{ github.event.pull_request.base.repo.full_name }} git pull --no-edit upstream ${{ github.event.pull_request.base.ref }} - name: Commit Changes