From df4b690e8d5e37cddfba2d6ffa992b5af8537ab1 Mon Sep 17 00:00:00 2001 From: Volodymyr Vreshch Date: Wed, 15 Apr 2026 22:53:15 +0200 Subject: [PATCH] ci(release): add PAT_TOKEN fallback so auto-merge fires today MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR #98 wired RELEASE_PAT as the preferred token, falling back to GITHUB_TOKEN. Since RELEASE_PAT is not configured in this org yet, the fallback resolves to GITHUB_TOKEN — same stuck behavior we set out to fix. PAT_TOKEN (created 2026-01-25) is already an org secret. Wire it as the middle-tier fallback so auto-merge works today; RELEASE_PAT still takes precedence when a dedicated release PAT is added later. --- .github/workflows/release-prepare.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-prepare.yml b/.github/workflows/release-prepare.yml index 88c59ea..2b4b090 100644 --- a/.github/workflows/release-prepare.yml +++ b/.github/workflows/release-prepare.yml @@ -117,7 +117,7 @@ jobs: if: steps.check_pr.outputs.skip != 'true' && steps.check_commits.outputs.has_commits == 'true' id: create_pr env: - GH_TOKEN: ${{ secrets.RELEASE_PAT || secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.RELEASE_PAT || secrets.PAT_TOKEN || secrets.GITHUB_TOKEN }} run: | RELEASE_LABEL="${{ steps.bump.outputs.release_label }}" # Create a safe branch name from label (replace @ with - and , with -) @@ -177,7 +177,7 @@ jobs: - name: Auto-merge release PR if: steps.create_pr.outputs.pr_url && github.event.inputs.auto_merge == 'true' env: - GH_TOKEN: ${{ secrets.RELEASE_PAT || secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.RELEASE_PAT || secrets.PAT_TOKEN || secrets.GITHUB_TOKEN }} run: | gh pr merge "${{ steps.create_pr.outputs.pr_url }}" --auto --squash