Disable auto merge for snapshot deployments#18553
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR disables auto-merge for snapshot deployments to prevent release blockages caused by merge conflicts between master and snapshot commits. Beta/RC snapshots should be deployable even with merge conflicts present, as they don't require conflict resolution to be valid builds.
- Changes auto_merge parameter from "true" to "false" in the GitHub workflow deployment configuration
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.
Link to issue number:
Fixup of #18244
Summary of the issue:
Beta/rc snapshots will fail to deploy if there are merge conflicts between master and the snapshot commit.
This will cause releases to be blocked, as we expect a passing beta/rc snapshot to perform the tagged release.
Beta/rc don't need to have merge conflicts resolved to be a valid build, though regular merging to minimize these is ideal.
Description of user facing changes:
None