From ee92c4a7d8720591a31590a919888eb086e5ba45 Mon Sep 17 00:00:00 2001 From: Jon B Date: Tue, 24 Feb 2026 18:05:50 -0600 Subject: [PATCH 1/2] fix(ci): parse release-please PR JSON and split approve/merge steps The pr output is a JSON PullRequest object, not a PR number. Extract the number with jq. Split approve and merge into separate steps with continue-on-error on approve (GITHUB_TOKEN can't self-approve PRs it created). Co-Authored-By: Claude Opus 4.6 --- .github/workflows/release.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ddc18ff3..c912fa21 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,13 +25,24 @@ jobs: release-type: node package-name: thumbcode + - name: Approve release PR + if: steps.release.outputs.prs_created == 'true' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_JSON: ${{ steps.release.outputs.pr }} + run: | + PR_NUMBER=$(echo "$PR_JSON" | jq -r '.number') + gh pr review "$PR_NUMBER" --approve + continue-on-error: true + - name: Enable auto-merge on release PR - if: steps.release.outputs.pr + if: steps.release.outputs.prs_created == 'true' env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_JSON: ${{ steps.release.outputs.pr }} run: | - gh pr review "${{ steps.release.outputs.pr }}" --approve - gh pr merge "${{ steps.release.outputs.pr }}" --auto --squash + PR_NUMBER=$(echo "$PR_JSON" | jq -r '.number') + gh pr merge "$PR_NUMBER" --auto --squash build-apk: name: Build Android Debug APK From 0f0a97bef7da42f20bef8ec442e5ff0a10a1177d Mon Sep 17 00:00:00 2001 From: Jon B Date: Tue, 24 Feb 2026 18:20:40 -0600 Subject: [PATCH 2/2] fix(ci): add workflow_dispatch trigger to release.yml When release-please auto-merges its own PR via GITHUB_TOKEN, the push event doesn't trigger a new workflow run (GitHub's cascading prevention). Adding workflow_dispatch allows manual triggering to complete the release flow. Long-term fix: use a PAT for release-please so merged PR pushes trigger workflows normally. Co-Authored-By: Claude Opus 4.6 --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6c07389..9a6ea304 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,7 @@ on: branches: [main] release: types: [published] + workflow_dispatch: permissions: contents: write