From 058d3d17f97aca5486c33b270bff0fa4cf3de827 Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Fri, 18 Apr 2025 18:22:57 +0800 Subject: [PATCH] feat(GHA): Renovate auto rebase after PR automerge enabled --- .github/workflows/renovate-rebase.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/renovate-rebase.yaml b/.github/workflows/renovate-rebase.yaml index 6b4f982f..b8366595 100644 --- a/.github/workflows/renovate-rebase.yaml +++ b/.github/workflows/renovate-rebase.yaml @@ -35,11 +35,12 @@ jobs: getOtherRuns () { return $(( $(gh run list --workflow=renovate-rebase.yaml --status in_progress --json name | jq length) + $(gh run list --workflow=renovate-rebase.yaml --status queued --json name | jq length) + $(gh run list --workflow=renovate-rebase.yaml --status waiting --json name | jq length) + $(gh run list --workflow=renovate-rebase.yaml --status requested --json name | jq length) + $(gh run list --workflow=renovate-rebase.yaml --status pending --json name | jq length) )) } - for getOtherRuns in 0; do + for getOtherRuns in 1; do sleep 2 - if [[ ( getOtherRuns == 0 ) ]]; then + if [[ ( getOtherRuns == 1 ) ]]; then 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=${{ github.event.pull_request.head.sha }} break fi + sleep 1 done