DM-49411: Add the rebase_checker workflow #4330
Open
Conversation
This file contains 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
jonathansick
force-pushed
the
tickets/DM-49411
branch
from
cb56f6b to
58a1f18
Compare
This reusable workflow checks if the main branch has been merged into a PR's branch. This commonly happens when folks update their branch with the GitHub UI. The downside of this approach is that it makes Git history really hard to understand in a PR because commits from main are intermixed with new commits. This workflows encourages people to use the rebases, with a link to the Developer Guide.
jonathansick
force-pushed
the
tickets/DM-49411
branch
from
58a1f18 to
12dfb69
Compare
rra
approved these changes
Mar 10, 2025
|
Hmm. I'll make it required and see if it merges ok. |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
|
Yep, that's the issue: gsactions/commit-message-checker@v2 doesn't work in a merge group. I'll see if there's a way to skip the rule in a merge_group context. |
The gsactions/commit-message-checker@v2 within the rebase_checker workflow is not compatible with merge_group. This is a way around that by having the workflow skip execution when part of a merge group.
github-merge-queue bot
pushed a commit
that referenced
this pull request
Mar 10, 2025
DM-49411: Add the rebase_checker workflow
|
When I tried skipping the rebase checker from the |
|
Oh, right, that's what it was. I think we can make it optional but not mandatory. Making it optional would still at least send a warning to the person making the PR that it failed, and would warn reviewers, so that may be worth doing. |
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.
This reusable workflow checks if the main branch has been merged into a PR's branch. This commonly happens when folks update their branch with the GitHub UI. The downside of this approach is that it makes Git history really hard to understand in a PR because commits from main are intermixed with new commits. This workflows encourages people to use the rebases, with a link to the Developer Guide.