Fix: Major version protection should only run on PRs targeting main or release branches #3161
Conversation
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
…se branches The major version protection was incorrectly blocking all PRs with major changes, even those targeting feature branches. This fix ensures protection only runs on: - PRs targeting 'main' branch - PRs targeting calver release branches (starting with '20', e.g., '2024-01', '2025-07') This allows feature branch development to proceed without major version blocks, while still protecting main and release branches from unintended major changes.
Contributor
|
Oxygen deployed a preview of your
Learn more about Hydrogen's GitHub integration. |
kdaviduik
reviewed
Sep 11, 2025
| if: | | ||
| github.event_name == 'pull_request' && | ||
| (github.event.pull_request.base.ref == 'main' || | ||
| startsWith(github.event.pull_request.base.ref, '20')) |
kdaviduik
approved these changes
Sep 11, 2025
juanpprieto
added a commit
that referenced
this pull request
Sep 17, 2025
…se branches (#3161) The major version protection was incorrectly blocking all PRs with major changes, even those targeting feature branches. This fix ensures protection only runs on: - PRs targeting 'main' branch - PRs targeting calver release branches (starting with '20', e.g., '2024-01', '2025-07') This allows feature branch development to proceed without major version blocks, while still protecting main and release branches from unintended major changes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
WHY are these changes introduced?
The Major Version Protection workflow was incorrectly blocking ALL pull requests containing major version changes, regardless of their target branch. This was preventing normal feature branch development workflows where branches merge into other feature branches before eventually reaching main.
Evidence of the issue:
feat/cli-diff-removal(not main) was blocked by major version protectionpull_requestevents without checking the base branchWHAT is this pull request doing?
This PR fixes the Major Version Protection workflow to only run on PRs that are actually targeting protected branches:
mainbranch2024-01,2025-07)The fix: Updates the workflow's
ifcondition to checkgithub.event.pull_request.base.refbefore running the protection job.HOW to test your changes?
2025-01→ Protection SHOULD run/bypass-major-safeguardcommand should still work on protected PRsChecklist