Repository navigation
Conversation
…dev_pr.yml workflow
rok
force-pushed
the
gh-55475-merge-button
branch
from
November 10, 2026 21:02
4b8ed1c to
c34e788
Compare
|
|
rok
force-pushed
the
gh-55475-merge-button
branch
5 times, most recently
from
November 10, 2026 22:43
a681b72 to
8af40b8
Compare
rok
force-pushed
the
gh-55475-merge-button
branch
2 times, most recently
from
November 10, 2026 23:14
96ffdb2 to
3a6799e
Compare
rok
marked this pull request as ready for review
November 10, 2026 23:24
rok
requested review from
assignUser,
jonkeane,
kou and
raulcd
as code owners
November 10, 2026 23:24
rok
force-pushed
the
gh-55475-merge-button
branch
from
November 10, 2026 23:41
3a6799e to
65e2f5a
Compare
rok
force-pushed
the
gh-55475-merge-button
branch
from
November 11, 2026 09:17
65e2f5a to
36ac2dd
Compare
rok
force-pushed
the
gh-55475-merge-button
branch
from
November 11, 2026 10:44
22f4699 to
256db9b
Compare
rok
force-pushed
the
gh-55475-merge-button
branch
from
November 11, 2026 11:25
256db9b to
f1c623f
Compare
rok
force-pushed
the
gh-55475-merge-button
branch
from
November 11, 2026 11:49
f1c623f to
423b612
Compare
rok
force-pushed
the
gh-55475-merge-button
branch
from
November 11, 2026 12:15
423b612 to
227840b
Compare
rok
force-pushed
the
gh-55475-merge-button
branch
from
November 11, 2026 12:21
227840b to
1725e0f
Compare
Document the "Squash and merge" button as the way to merge pull requests. The merge script is still available. Before the merge, the "PR Title" status of the Boring Cyborg app is a required status check on main: the pull request title must start with "GH-XXX" or "MINOR: ". The required check rejects direct pushes to main, so the release guide tells release managers to bump versions with a pull request. After the merge, a workflow for pushes to main assigns the issue to the pull request author if it isn't assigned, sets its milestone, closes it and comments which pull request resolved it.
rok
force-pushed
the
gh-55475-merge-button
branch
from
November 11, 2026 12:49
1725e0f to
f37b26b
Compare
Member
Author
|
@Reranko05 What do you think about this? (Note this is a stacked PR, the actual change is only f37b26b). |
Reranko05
reviewed
Nov 12, 2026
Reranko05
left a comment
Collaborator
There was a problem hiding this comment.
I haven't looked too deeply into the logic, but I left a couple of minor documentation suggestions. Nothing major!
(Although this doesn't apply to me just yet, hopefully it will someday 😅)
Reranko05
approved these changes
Nov 15, 2026
Reranko05
left a comment
Collaborator
There was a problem hiding this comment.
LGTM! I looked through the workflow changes, and nothing stands out to me :)
3 of 5 tasks
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.
Rationale for this change
Committers need a personal access token and
dev/merge_arrow_pr.pyto merge. This lets them use the "Squash and merge" button instead, like apache/arrow-rs does.This is stacked on #55474. Its commit is the first one here, so the diff also shows its files:
.github/boring-cyborg.yml,.github/pull_request_template.mdand the removed.github/workflows/dev_pr.ymland.github/workflows/dev_pr/. Only the second commit is this pull request. It must not be merged before #55474: see "Things to discuss".What changes are included in this PR?
.asf.yaml: the "PR Title" status of the Boring Cyborg app (GH-55473: [Dev] Add boring-cyborg app configuration and remove dev_pr.yml workflow #55474) becomes a required status check ofmain. The merge is blocked unless the title starts withGH-XXXorMINOR:..github/workflows/dev_pr_merged.yml(new): runs on pushes tomain. If the pushed commit is the merge commit of aGH-XXX: ...pull request, it:It does nothing for
MINOR: ...pull requests. It's a singleghstep, without custom scripts or third-party actions.dev/README.md,docs/source/developers/overview.rst,docs/source/developers/continuous_integration/overview.rst: describe the merge button and the new workflow instead of requiring the merge script.docs/source/developers/release.rst: the required check rejects direct pushes tomain, so the "Bump versions" step now says to runpost-10-bump-versions.shwithBUMP_PUSH=0 BUMP_TAG=0, create aMINOR: [Release] ...pull request from the commits and tag the merged commit by hand.Not changed: the merge script, the release scripts and the merge button settings (apache/arrow already allows only squash merges with the pull request title and description as the commit message).
Things to discuss
main. Merging also depends on the app being up.WIP: GH-XXX, a missing[Component]and a missing:pass), and nothing checks before the merge that the issue exists and is open. The rule could be tightened in.github/boring-cyborg.yml.post-10-bump-versions.shwithoutBUMP_PUSH=0 BUMP_TAG=0fails at the push.Authored-by:/Signed-off-by:trailers (GitHub addsCo-authored-by:), so "Patch Committers" in the release announcement, which countsSigned-off-by:, needs a follow-up. The description isn't cleaned unless the committer does it in the merge dialog.[skip ci]: GitHub doesn't run the new workflow for a merge commit with a CI directive in its message (4 of the last 2000 commits onmain), so the issue has to be closed manually then.Are these changes tested?
Only locally: a dry run of the workflow step against apache/arrow (real merged commits and faked issue states, with the writes printed instead of executed). The workflow and the required check can only run once this is on
main. The manual release steps in the guide have not been tried.Are there any user-facing changes?
No.
Was AI used for this PR?
PR code and description written by:
Reviewed before submission by: