From 5bfbb23eacaa5dec2caa30d16b874310d6cf074c Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Wed, 17 Sep 2025 13:16:26 +0800 Subject: [PATCH] Update auto_merge_renovate_prs.yml --- .github/workflows/auto_merge_renovate_prs.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto_merge_renovate_prs.yml b/.github/workflows/auto_merge_renovate_prs.yml index c3c7bab6e..249442a32 100644 --- a/.github/workflows/auto_merge_renovate_prs.yml +++ b/.github/workflows/auto_merge_renovate_prs.yml @@ -17,12 +17,15 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Set GH_TOKEN for GitHub CLI + run: echo "GH_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV + - name: List open Renovate PRs id: list run: | prs=$(gh pr list --repo "$GITHUB_REPOSITORY" --state open \ --json number,author \ - --jq '.[] | select(.author.login | test("renovate"; "i")) | .number') + --jq '.[] | select(.author.login | test("renovate|mend-renovate"; "i")) | .number') prs_json=$(printf '%s\n' "$prs" | jq -R . | jq -s .) echo "prs=$prs_json" >> $GITHUB_OUTPUT @@ -47,7 +50,7 @@ jobs: if [[ "$combined" == "success" && "$inprogress" -eq 0 ]]; then echo "All checks passed for PR #$pr. Merging..." - if gh pr merge "$pr" --repo "$GITHUB_REPOSITORY" --merge --delete-branch; then + if gh pr merge "$pr" --repo "$GITHUB_REPOSITORY" --merge --delete-branch --yes; then echo "✅ PR #$pr merged successfully." merged=true else