From 266bfa10772c76ccad2a8dd864c86dd459474f6d Mon Sep 17 00:00:00 2001 From: Sambhav Kothari Date: Tue, 3 May 2022 09:03:43 +0100 Subject: [PATCH] Fix PR update flow and allow updates from release branches (#3780) Signed-off-by: Sambhav Kothari --- .github/workflows/pr-update.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-update.yaml b/.github/workflows/pr-update.yaml index a701c5f10c..17421a432e 100644 --- a/.github/workflows/pr-update.yaml +++ b/.github/workflows/pr-update.yaml @@ -4,6 +4,7 @@ on: push: branches: - 'main' + - 'release-*' jobs: autoupdate: permissions: @@ -13,8 +14,8 @@ jobs: - name: Automatically update PR uses: adRise/update-pr-branch@437fab6e0ac7d2a668f2c479f64225edd7f303fd # v0.6.0 with: - token: ${{ secrets.GITHUB_TOKEN }} - base: 'main' + token: ${{ secrets.PR_UPDATE_TOKEN }} + base: ${{ env.GITHUB_REF_NAME }} required_approval_count: 1 require_passed_checks: true sort: 'updated'