Add branch/PR integration audit script, runbook, and Make target#22
Merged
Add branch/PR integration audit script, runbook, and Make target#22
Conversation
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 033c7e5517
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
mainto avoid dropped commits or merge drift.SAFE FAST-FORWARD,ALREADY INTEGRATED,DIVERGED) so merges are chosen with clear intent and minimal surprises.Description
tools/audit_branch_pr_integration.sh, a POSIX-compatible script that compares a source ref and a target branch, lists merge commits, counts missing commits, computes the merge base, and classifies the merge status.docs/vnext/integration/branch_pr_merge_runbook.mdwith preconditions, the audit-first workflow, recommended merge commands, post-merge checks, and recommended recovery tagging.docs/vnext/integration/README.mdto link the new runbook for discoverability.Makefiletargetintegration-auditthat runs./tools/audit_branch_pr_integration.sh main HEADto standardize invocation from the repo root and set executable permissions on the script.Testing
./tools/audit_branch_pr_integration.sh work HEAD, which executed successfully and reported a safe fast-forward state for the inspected refs.make integration-audit, which failed early and reported that the localmainbranch did not exist (this is an expected environment-state failure to be resolved by fetching/creatingmain).make verify, which failed to complete due to external dependency/network limitations: Rustcargofailed to download crates (HTTP 403), Go tests failed due to missinggo.sumentries forgolang.org/x/crypto/chacha20poly1305, and the Python fixture verifier failed due to a missingcryptographypackage.Codex Task