ci: adopt org-level fast-forward merge - #248
Merged
Merged
Conversation
Comment /fast-forward on a PR to advance master to the PR head as-is: commit SHAs and their GPG/SSH signatures survive, history stays linear. "Rebase and merge" rewrites commits and voids every signature. Gating is whatever this repo's own rulesets already require — the shared workflow reads GitHub's native mergeable_state and defines no policy of its own. Pinned to arcboxlabs/actions@a940102.
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: f5bfe5c472
ℹ️ 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".
Greptile SummaryThis PR adds a comment-driven fast-forward merge workflow. The main changes are:
Confidence Score: 5/5This looks safe to merge. No blocking issues found in the changed code.
 T-Rex LogsWhat T-Rex did
Important Files Changed
Reviews (2): Last reviewed commit: "style(ci): English comments in the fast-..." | Re-trigger Greptile |
Matches the repo's comment convention. Also repins to arcboxlabs/actions@086869f, which carries the same change upstream.
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
1 participant
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.
Comment
/fast-forwardon a PR and this repo'smasteris advanced to the PRhead as-is — commit SHAs unchanged, so GPG/SSH signatures survive and the
history stays linear. GitHub's "Rebase and merge" rewrites every commit
(new committer, new SHA) and voids all signatures; the web UI offers no
fast-forward option.
All logic lives in the shared reusable workflow at
arcboxlabs/actions;this is a ~20-line shell pinned to
arcboxlabs/actions@a940102.What it does not change
Nothing about this repo's merge policy. The gate is GitHub's own
mergeable_state— i.e. exactly what the native merge button requires rightnow under our rulesets (1 approval, Copilot review, resolved threads). Change a
ruleset and the gate follows automatically; the workflow defines no policy of
its own. Repo
writeis required to trigger; admins can explicitly bypass with/fast-forward bypass, which leaves an audit trail in the PR and the run log.Prerequisites (already done)
arcbox-labsApp is in the bypass list of bothProtect default branch(org)and
Require Reviewer(repo), modealways.BOT_APP_ID/BOT_APP_PRIVATE_KEYare reachable from this repo.One caveat
The App has no
Workflowspermission, so PRs that touch.github/workflows/cannot be fast-forwarded — including this one. Merge this with the native
button; subsequent regular PRs get signature-preserving merges.