Skip to content

ci: prevent merge-commits in a PR #2779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

ci: prevent merge-commits in a PR #2779

wants to merge 1 commit into from

Conversation

JohnVillalovos
Copy link
Member

@JohnVillalovos JohnVillalovos commented Jan 28, 2024 •
edited
Loading

Have the CI prevent merge-commits being part of a PR

@JohnVillalovos JohnVillalovos marked this pull request as draft January 28, 2024 02:21
@JohnVillalovos JohnVillalovos force-pushed the jlvillal/stop_merge_commits branch 7 times, most recently from 9f52e07 to 6f68505 Compare January 28, 2024 02:46
@JohnVillalovos JohnVillalovos marked this pull request as ready for review January 28, 2024 02:48
@JohnVillalovos JohnVillalovos force-pushed the jlvillal/stop_merge_commits branch from 6f68505 to e73506e Compare January 28, 2024 02:58
@JohnVillalovos JohnVillalovos changed the title ci: prevent merge-requests in a PR ci: prevent merge-commits in a PR Jan 28, 2024
@JohnVillalovos
Copy link
Member Author

JohnVillalovos commented Jan 28, 2024 •
edited
Loading

Goal of this is to block PRs like: #2780

An example of a PR that did get merged with a merge-commit: #2465

This can happen if a PR gets out of date and the "Update" button is pressed in the WebUI rather than selecting to "Rebase" the PR.

@JohnVillalovos
ci: prevent merge-commits in a PR
d50bfb4 
Have the CI prevent merge-commits being part of a PR
@JohnVillalovos JohnVillalovos force-pushed the jlvillal/stop_merge_commits branch from e73506e to d50bfb4 Compare January 29, 2024 16:13
@JohnVillalovos
Copy link
Member Author

This should not be required as we have "Prevent Linear History" set in the settings for the protected branch main

@nejch
Copy link
Member

nejch commented Jan 31, 2024

Thanks @JohnVillalovos that was my thinking as well. I guess that was merged before we enabled the feature right?

@JohnVillalovos
Copy link
Member Author

Thanks @JohnVillalovos that was my thinking as well. I guess that was merged before we enabled the feature right?

I guess so. There is no history (that I know of) where we can see when settings where changed for the project on GitHub.

@nejch nejch mentioned this pull request Feb 11, 2024
Closed
2 tasks
@JohnVillalovos JohnVillalovos deleted the jlvillal/stop_merge_commits branch May 17, 2024 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JohnVillalovos @nejch