diff --git a/.github/workflows/force-release.yml b/.github/workflows/force-release.yml index f683e29..92a0fc4 100644 --- a/.github/workflows/force-release.yml +++ b/.github/workflows/force-release.yml @@ -18,13 +18,18 @@ on: - major permissions: - contents: write - pull-requests: write + contents: read 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: + contents: write + pull-requests: write env: HUSKY: "0" steps: @@ -44,6 +49,7 @@ jobs: chore(release): force $BUMP release for $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 }} @@ -56,8 +62,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." + --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: | + for _ in $(seq 1 12); do + 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 + echo "::error::No pull_request run was found for #$PR_NUMBER at $HEAD_SHA." + exit 1