From 36e6c94871e362b151b1606f86450f71e9234666 Mon Sep 17 00:00:00 2001 From: systemfsoftware-bot Date: Fri, 20 Nov 2026 20:24:35 -0500 Subject: [PATCH 1/5] ci(release): dispatch CI on the force-release branch --- .github/workflows/force-release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/force-release.yml b/.github/workflows/force-release.yml index 206592ac6..cea5f974e 100644 --- a/.github/workflows/force-release.yml +++ b/.github/workflows/force-release.yml @@ -22,6 +22,7 @@ on: - major permissions: + actions: write contents: write pull-requests: write @@ -62,3 +63,7 @@ jobs: --head "$BRANCH" \ --title "chore(release): force $BUMP" \ --body "Manually triggered ${BUMP} release (run ${{ github.run_id }}). Merging drops a dummy changeset intent on main; the Release workflow then opens the version-packages PR." + # A pull request opened with the workflow token starts its pull_request workflows in `action_required` with + # no jobs, so the required check is never emitted. A dispatched run is not gated that way and reports its + # checks on the branch head the pull request points at. + gh workflow run ci.yml --ref "$BRANCH" From df03b93cb7dd34be463b8d6cb613c4837526f9e5 Mon Sep 17 00:00:00 2001 From: systemfsoftware-bot Date: Fri, 20 Nov 2026 20:31:41 -0500 Subject: [PATCH 2/5] ci(release): grant actions write to the dispatching job only and dispatch refs/heads --- .github/workflows/force-release.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/force-release.yml b/.github/workflows/force-release.yml index cea5f974e..ea6c623f2 100644 --- a/.github/workflows/force-release.yml +++ b/.github/workflows/force-release.yml @@ -22,14 +22,17 @@ on: - major permissions: - actions: write - contents: write - pull-requests: write + contents: read jobs: force-release: name: dummy changeset + release PR runs-on: ubuntu-latest + # Only this job writes: it pushes the branch, opens the pull request and dispatches CI on the branch. + permissions: + actions: write + contents: write + pull-requests: write env: HUSKY: "0" steps: @@ -66,4 +69,4 @@ jobs: # A pull request opened with the workflow token starts its pull_request workflows in `action_required` with # no jobs, so the required check is never emitted. A dispatched run is not gated that way and reports its # checks on the branch head the pull request points at. - gh workflow run ci.yml --ref "$BRANCH" + gh workflow run ci.yml --ref "refs/heads/$BRANCH" From 5df94e8acb739f4e5d10d10c5b5ae71fb853b4f5 Mon Sep 17 00:00:00 2001 From: systemfsoftware-bot Date: Fri, 20 Nov 2026 20:47:01 -0500 Subject: [PATCH 3/5] ci(release): approve the CI run a force-release pull request holds --- .github/workflows/force-release.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/force-release.yml b/.github/workflows/force-release.yml index ea6c623f2..d538988d8 100644 --- a/.github/workflows/force-release.yml +++ b/.github/workflows/force-release.yml @@ -28,9 +28,7 @@ jobs: force-release: name: dummy changeset + release PR runs-on: ubuntu-latest - # Only this job writes: it pushes the branch, opens the pull request and dispatches CI on the branch. permissions: - actions: write contents: write pull-requests: write env: @@ -66,7 +64,21 @@ jobs: --head "$BRANCH" \ --title "chore(release): force $BUMP" \ --body "Manually triggered ${BUMP} release (run ${{ github.run_id }}). Merging drops a dummy changeset intent on main; the Release workflow then opens the version-packages PR." - # A pull request opened with the workflow token starts its pull_request workflows in `action_required` with - # no jobs, so the required check is never emitted. A dispatched run is not gated that way and reports its - # checks on the branch head the pull request points at. - gh workflow run ci.yml --ref "refs/heads/$BRANCH" + - name: Approve the CI run the pull request holds + env: + GH_TOKEN: ${{ github.token }} + run: | + # A pull request opened with the workflow token starts its pull_request workflows in `action_required` + # with no jobs, so the required check is never emitted until a run is approved. + sha=$(git rev-parse HEAD) + for _ in $(seq 1 12); do + id=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs?head_sha=$sha&event=pull_request" \ + --jq '[.workflow_runs[] | select(.conclusion == "action_required")][0].id // empty') + [ -n "$id" ] && break + sleep 5 + done + if [ -z "$id" ]; then + echo "No pull_request run is held on $sha." + exit 0 + fi + gh api --method POST "repos/$GITHUB_REPOSITORY/actions/runs/$id/approve" From 3a3afdbb2aa91d1588e0923324c0e628901d220c Mon Sep 17 00:00:00 2001 From: systemfsoftware-bot Date: Fri, 20 Nov 2026 20:52:48 -0500 Subject: [PATCH 4/5] ci(release): grant actions write so the job can approve the held CI run --- .github/workflows/force-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/force-release.yml b/.github/workflows/force-release.yml index d538988d8..d3586016d 100644 --- a/.github/workflows/force-release.yml +++ b/.github/workflows/force-release.yml @@ -29,6 +29,7 @@ jobs: name: dummy changeset + release PR runs-on: ubuntu-latest permissions: + actions: write contents: write pull-requests: write env: From bd5806d5eac59802240f8eefdb26febb6d773d9f Mon Sep 17 00:00:00 2001 From: systemfsoftware-bot Date: Fri, 20 Nov 2026 21:01:33 -0500 Subject: [PATCH 5/5] ci(release): approve the held CI run in a minimal downstream job that fails closed --- .github/workflows/force-release.yml | 61 +++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 17 deletions(-) diff --git a/.github/workflows/force-release.yml b/.github/workflows/force-release.yml index d3586016d..01d03c525 100644 --- a/.github/workflows/force-release.yml +++ b/.github/workflows/force-release.yml @@ -28,8 +28,10 @@ jobs: force-release: name: dummy changeset + release PR runs-on: ubuntu-latest + outputs: + pr_number: ${{ steps.pr.outputs.number }} + head_sha: ${{ steps.pr.outputs.head_sha }} permissions: - actions: write contents: write pull-requests: write env: @@ -48,6 +50,7 @@ jobs: chore(release): force ${{ inputs.bump }} release for ${{ inputs.package }} via workflow dispatch EOF - name: Commit, push, and open PR + id: pr env: GH_TOKEN: ${{ github.token }} BRANCH: force-release/${{ inputs.bump }}-${{ github.run_id }} @@ -60,26 +63,50 @@ jobs: git add .changeset git commit -m "chore(release): force $BUMP via workflow dispatch" git push origin "$BRANCH" - gh pr create \ + url=$(gh pr create \ --base "$BASE" \ --head "$BRANCH" \ --title "chore(release): force $BUMP" \ - --body "Manually triggered ${BUMP} release (run ${{ github.run_id }}). Merging drops a dummy changeset intent on main; the Release workflow then opens the version-packages PR." - - name: Approve the CI run the pull request holds - env: - GH_TOKEN: ${{ github.token }} + --body "Manually triggered ${BUMP} release (run ${{ github.run_id }}). Merging drops a dummy changeset intent on main; the Release workflow then opens the version-packages PR.") + # The pull request's own head commit, as GitHub reports it. + gh pr view "$url" --json number,headRefOid --jq '"number=\(.number)\nhead_sha=\(.headRefOid)"' >> "$GITHUB_OUTPUT" + + approve-ci: + name: approve the held CI run + needs: force-release + if: needs.force-release.outputs.pr_number != '' + runs-on: ubuntu-latest + permissions: + actions: write + env: + GH_TOKEN: ${{ github.token }} + PR_NUMBER: ${{ needs.force-release.outputs.pr_number }} + HEAD_SHA: ${{ needs.force-release.outputs.head_sha }} + steps: + # A pull request opened with the workflow token starts its pull_request workflows in `action_required` with no + # jobs, so the required check is never emitted until a person or token with actions access approves the run. + # Fails closed: it succeeds only when every held run was approved or a run for the pull request already exists. + - name: Approve every pull_request run the pull request holds run: | - # A pull request opened with the workflow token starts its pull_request workflows in `action_required` - # with no jobs, so the required check is never emitted until a run is approved. - sha=$(git rev-parse HEAD) for _ in $(seq 1 12); do - id=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs?head_sha=$sha&event=pull_request" \ - --jq '[.workflow_runs[] | select(.conclusion == "action_required")][0].id // empty') - [ -n "$id" ] && break + runs=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs?head_sha=$HEAD_SHA&event=pull_request&per_page=100" \ + --jq "[.workflow_runs[] + | select(.head_repository.full_name == \"$GITHUB_REPOSITORY\" + and .actor.login == \"github-actions[bot]\" + and any(.pull_requests[]?; .number == ($PR_NUMBER | tonumber)))]") + held=$(jq -r '[.[] | select(.conclusion == "action_required") | .id] | .[]' <<< "$runs") + if [ -n "$held" ]; then + for id in $held; do + gh api --method POST "repos/$GITHUB_REPOSITORY/actions/runs/$id/approve" + echo "Approved run $id." + done + exit 0 + fi + if [ "$(jq 'length' <<< "$runs")" -gt 0 ]; then + echo "A pull_request run already exists for #$PR_NUMBER and none is held." + exit 0 + fi sleep 5 done - if [ -z "$id" ]; then - echo "No pull_request run is held on $sha." - exit 0 - fi - gh api --method POST "repos/$GITHUB_REPOSITORY/actions/runs/$id/approve" + echo "::error::No pull_request run was found for #$PR_NUMBER at $HEAD_SHA." + exit 1