Squash & Approve - #828
Merged
Merged
Squash & Approve#828
Conversation
medzernik
force-pushed
the
691/impl-bors-squash-r-plus
branch
from
August 23, 2026 09:43
7fbdf0b to
ab07984
Compare
medzernik
marked this pull request as draft
August 24, 2026 14:01
medzernik
force-pushed
the
691/impl-bors-squash-r-plus
branch
from
September 6, 2026 21:37
ab07984 to
d1b84ce
Compare
Contributor
Author
|
Thanks! I'll try to fix the remaining errors in tests and get it cleaned up today or tommorow. |
medzernik
marked this pull request as ready for review
September 9, 2026 17:32
Kobzol
reviewed
Sep 10, 2026
Member
There was a problem hiding this comment.
Thanks! Left some comments.
There is one race condition that we'll need to handle in handle_push_to_pull_request. If we push the squashed commit, GitHub will send us a webhook about the push, which will unapprove the PR in handle_push_to_pull_request. Of course that is not ideal if we just approved it after the squash :)
I will push some unrelated refactoring towards that.
Kobzol
reviewed
Sep 14, 2026
medzernik
force-pushed
the
691/impl-bors-squash-r-plus
branch
from
September 19, 2026 08:17
33f8e57 to
dbbf7f9
Compare
This comment has been minimized.
This comment has been minimized.
medzernik
force-pushed
the
691/impl-bors-squash-r-plus
branch
from
September 19, 2026 11:04
2edd30e to
cbf2076
Compare
This comment has been minimized.
This comment has been minimized.
medzernik
force-pushed
the
691/impl-bors-squash-r-plus
branch
from
September 24, 2026 19:44
9afb35e to
c2a1c1f
Compare
This comment has been minimized.
This comment has been minimized.
medzernik
force-pushed
the
691/impl-bors-squash-r-plus
branch
from
September 24, 2026 19:53
c2a1c1f to
6a57d73
Compare
Kobzol
reviewed
Sep 25, 2026
Member
There was a problem hiding this comment.
Thanks, left some comments. Let's wait for #859 to merge and then do another rebase (sorry 😅).
This comment has been minimized.
This comment has been minimized.
medzernik
force-pushed
the
691/impl-bors-squash-r-plus
branch
2 times, most recently
from
September 25, 2026 22:19
1bee16c to
61bc261
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
medzernik
force-pushed
the
691/impl-bors-squash-r-plus
branch
from
September 26, 2026 12:05
3200f7b to
68001a4
Compare
Added a new command that can squash and, if successful, approve a the latest resulting commit Signed-off-by: David Manca <1900179+medzernik@users.noreply.github.com> # Conflicts: # src/bors/handlers/review.rs # Conflicts: # src/bors/handlers/review.rs
medzernik
force-pushed
the
691/impl-bors-squash-r-plus
branch
from
September 27, 2026 13:50
e171f24 to
6f4d388
Compare
Kobzol
approved these changes
Sep 27, 2026
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
3 participants
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.
Added a Squash and Approve function. This should fix #691.
Please let me know anything I can do to improve the code if needed.
I would add that in
https://github.com/medzernik/bors/blob/ab07984372498f757ab06438e926a6a6c0424c2b/src/bors/handlers/squash.rs#L25-L27
I wanted to use some more differentiated error states, but with anyhow and the general practice of returning
Ok(X)even if an error technically occurs, I just wrapped theshain anOption<sha>Mentored by: @Kobzol