Skip to content

fix: accept canonical G2 merge push shape - #8

Merged
BunsDev merged 2 commits into
mainfrom
fix/g2-post-merge-event-shape
Aug 12, 2026
Merged

fix: accept canonical G2 merge push shape#8
BunsDev merged 2 commits into
mainfrom
fix/g2-post-merge-event-shape

Conversation

@BunsDev

@BunsDev BunsDev commented Aug 12, 2026

Copy link
Copy Markdown
Member

Narrows the post-squash verifier to stable, authoritative push fields after the live main event exposed variation in redundant webhook metadata.

Security remains fail-closed through exact repository/main ref, valid before/after SHAs, pushed commit sole-parent verification, unique merged same-repo PR association, squash-to-reviewed-tree equality, and the evidence-only tested-source comparison.

Evidence is candidate until exact-source CI passes.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI lite review requested due to automatic review settings August 12, 2026 05:11

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adjusts the G2 evidence verifier to accept the canonical GitHub “push to main after squash-merge” event shape by relying only on stable push payload fields, and updates the evidence document/template to reflect “candidate” status until CI attestation is recorded.

Changes:

  • Relaxed main push event validation in the post-squash verifier to avoid relying on redundant/variable webhook metadata (created/deleted/forced/size/distinct_size/commits/head_commit).
  • Updated the test fixture push payload to match the newly accepted canonical event shape.
  • Converted docs/G2-EVIDENCE.md back to “candidate” placeholders and “not run remotely” matrix rows.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
scripts/check-g2-evidence.py Narrows push-event provenance checks to ref + before/after SHAs while keeping downstream PR/commit/tree verification intact.
scripts/check-g2-evidence-test.py Updates the squash-merge push event fixture to omit redundant webhook fields no longer required by the verifier.
docs/G2-EVIDENCE.md Resets the evidence document to “candidate” placeholders and “not run remotely” results pending CI attestation.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@BunsDev
BunsDev merged commit 1e47b40 into main Aug 12, 2026
7 checks passed
@BunsDev
BunsDev deleted the fix/g2-post-merge-event-shape branch August 12, 2026 05:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants