From 5ad880a8d1158e6cb9261ad4bf7de152ed05e025 Mon Sep 17 00:00:00 2001 From: Raghav Gupta Date: Sun, 11 Oct 2026 12:40:13 -0300 Subject: [PATCH 1/2] ci: add merge-audit workflow Roll out the org merge-audit workflow (opens an unapproved-merge issue when a change reaches the default branch without the owner's merge or approval). Refs setkernel/hq#23 Co-Authored-By: Claude Opus 5.5 --- .github/workflows/merge-audit.yml | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/merge-audit.yml diff --git a/.github/workflows/merge-audit.yml b/.github/workflows/merge-audit.yml new file mode 100644 index 0000000..064a160 --- /dev/null +++ b/.github/workflows/merge-audit.yml @@ -0,0 +1,56 @@ +# merge-audit: GitHub Free can't require Raghav's approval on private repos, so this makes any +# change that reaches the default branch without him visible at once. On every push to the +# default branch it checks the commit's pull request: fine if Raghav merged it or approved it; +# otherwise (direct push, or a PR merged without his approval) it opens an `unapproved-merge` +# issue in this repo. Dependabot PRs merged by an auto-merge workflow are reported too. +name: merge-audit + +on: + push: + branches: [main, master] + +permissions: + contents: read + pull-requests: read + issues: write + +jobs: + audit: + if: github.ref_name == github.event.repository.default_branch + runs-on: ${{ github.event.repository.private && (vars.CI_RUNNER || 'setkernel-linux') || 'ubuntu-latest' }} + timeout-minutes: 5 + steps: + - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 + env: + APPROVER: ${{ vars.MERGE_APPROVER || 'realRaghavGupta' }} + with: + script: | + const approver = process.env.APPROVER.toLowerCase(); + const { owner, repo } = context.repo; + const sha = context.sha; + const prs = (await github.rest.repos.listPullRequestsAssociatedWithCommit({ owner, repo, commit_sha: sha })).data + .filter(p => p.merged_at); + let problem = null, link = `https://github.com/${owner}/${repo}/commit/${sha}`; + if (!prs.length) { + const pusher = (context.payload.pusher?.name || context.actor || '').toLowerCase(); + if (pusher !== approver) problem = `Direct push to \`${context.ref_name ?? 'main'}\` by **${pusher}** with no pull request.`; + } else { + const pr = prs[0]; link = pr.html_url; + const mergedBy = (pr.merged_by?.login || '').toLowerCase(); + const reviews = (await github.rest.pulls.listReviews({ owner, repo, pull_number: pr.number })).data; + const approved = reviews.some(r => r.state === 'APPROVED' && r.user?.login?.toLowerCase() === approver); + if (mergedBy !== approver && !approved) problem = `PR #${pr.number} was merged by **${mergedBy || 'unknown'}** without ${approver}'s approval.`; + } + if (!problem) { core.info('ok: merged or approved by ' + approver); return; } + await github.rest.issues.create({ + owner, repo, + title: `Unapproved change on the default branch (${sha.slice(0, 7)})`, + body: `${problem}\n\n${link}\n\nPer setkernel rules every change to the default branch needs ${approver}'s merge or approval. Review it, then close this issue with what you decided (keep, or revert).`, + labels: ['unapproved-merge'], + assignees: [process.env.APPROVER], + }).catch(async e => { + // label may not exist yet + await github.rest.issues.create({ owner, repo, title: `Unapproved change on the default branch (${sha.slice(0, 7)})`, + body: `${problem}\n\n${link}`, assignees: [process.env.APPROVER] }); + }); + core.warning(problem); From 8069868719268841c1a7f6fbd69f270ae66f6c2a Mon Sep 17 00:00:00 2001 From: Raghav Gupta Date: Sun, 11 Oct 2026 16:17:35 -0300 Subject: [PATCH 2/2] fix(merge-audit): use the fixed version (merged_by from the full PR) Co-Authored-By: Claude Opus 5.5 --- .github/workflows/merge-audit.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/merge-audit.yml b/.github/workflows/merge-audit.yml index 064a160..536e29a 100644 --- a/.github/workflows/merge-audit.yml +++ b/.github/workflows/merge-audit.yml @@ -35,22 +35,21 @@ jobs: const pusher = (context.payload.pusher?.name || context.actor || '').toLowerCase(); if (pusher !== approver) problem = `Direct push to \`${context.ref_name ?? 'main'}\` by **${pusher}** with no pull request.`; } else { - const pr = prs[0]; link = pr.html_url; + // the commit->PR list omits merged_by; fetch the full PR + const pr = (await github.rest.pulls.get({ owner, repo, pull_number: prs[0].number })).data; + link = pr.html_url; const mergedBy = (pr.merged_by?.login || '').toLowerCase(); const reviews = (await github.rest.pulls.listReviews({ owner, repo, pull_number: pr.number })).data; const approved = reviews.some(r => r.state === 'APPROVED' && r.user?.login?.toLowerCase() === approver); if (mergedBy !== approver && !approved) problem = `PR #${pr.number} was merged by **${mergedBy || 'unknown'}** without ${approver}'s approval.`; } if (!problem) { core.info('ok: merged or approved by ' + approver); return; } - await github.rest.issues.create({ - owner, repo, - title: `Unapproved change on the default branch (${sha.slice(0, 7)})`, - body: `${problem}\n\n${link}\n\nPer setkernel rules every change to the default branch needs ${approver}'s merge or approval. Review it, then close this issue with what you decided (keep, or revert).`, - labels: ['unapproved-merge'], - assignees: [process.env.APPROVER], - }).catch(async e => { - // label may not exist yet - await github.rest.issues.create({ owner, repo, title: `Unapproved change on the default branch (${sha.slice(0, 7)})`, - body: `${problem}\n\n${link}`, assignees: [process.env.APPROVER] }); - }); + const title = `Unapproved change on the default branch (${sha.slice(0, 7)})`; + const body = `${problem}\n\n${link}\n\nPer setkernel rules every change to the default branch needs ${approver}'s merge or approval. Review it, then close this issue with what you decided (keep, or revert).`; + if (!context.payload.repository.has_issues) { core.setFailed(`${problem} ${link} (Issues are disabled in this repo, so this failed run is the alert.)`); return; } + try { + await github.rest.issues.create({ owner, repo, title, body, labels: ['unapproved-merge'], assignees: [process.env.APPROVER] }); + } catch (e) { + await github.rest.issues.create({ owner, repo, title, body, assignees: [process.env.APPROVER] }); // label missing + } core.warning(problem);