From 6570995bea3da3d12d63e453ae626f82791587bf Mon Sep 17 00:00:00 2001 From: JJGadgets Date: Wed, 26 Nov 2025 23:36:44 +0800 Subject: [PATCH] feat(renovate): use proper gh command in rebase workflow --- .github/workflows/renovate-rebase.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/renovate-rebase.yaml b/.github/workflows/renovate-rebase.yaml index 8dc2aecf..4e8965b3 100644 --- a/.github/workflows/renovate-rebase.yaml +++ b/.github/workflows/renovate-rebase.yaml @@ -35,7 +35,7 @@ jobs: echo "i = ${i}" # sha=$(gh pr view ${i} --json headRefOid --jq '.headRefOid' --repo ${{ github.event.pull_request.base.repo.full_name }}) # echo "sha = ${sha}" - gh pr update-branch ${i} --repo ${{ github.event.pull_request.base.repo.full_name }} + until gh pr update-branch ${i} --repo ${{ github.event.pull_request.base.repo.full_name }}; do sleep 1; done done # gh api --method PUT /repos/${{ github.event.pull_request.base.repo.full_name }}/pulls/${i}/update-branch --field expected_head_sha=${sha} @@ -45,5 +45,5 @@ jobs: GITHUB_TOKEN: "${{ steps.oauth-token.outputs.token }}" shell: bash run: | - gh pr update-branch ${{ github.event.pull_request.number }} --repo ${{ github.event.pull_request.base.repo.full_name }} + until gh pr update-branch ${{ github.event.pull_request.number }} --repo ${{ github.event.pull_request.base.repo.full_name }}; do sleep 1; done # 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 }}