Skip to content

Update pr milestone checker to block merges if milestone is in code freeze#16836

Merged
richard-cox merged 1 commit intorancher:masterfrom
richard-cox:update-pr-check-milestone
Mar 5, 2026
Merged

Update pr milestone checker to block merges if milestone is in code freeze#16836
richard-cox merged 1 commit intorancher:masterfrom
richard-cox:update-pr-check-milestone

Conversation

@richard-cox
Copy link
Copy Markdown
Member

@richard-cox richard-cox commented Mar 4, 2026

Summary

Fixes: #16395

  • We now also track code freeze state as part of milestone metadata
  • Anyone can set code freeze state (not just repo admins)
  • If a milestone is in code freeze block merges
    • The same people / permissions can still overrule this and force merge

Related to #15927

Checklist

  • The PR is linked to an issue and the linked issue has a Milestone, or no issue is needed
  • The PR has a Milestone
  • The PR template has been filled out
  • The PR has been self reviewed
  • The PR has a reviewer assigned
  • The PR has automated tests or clear instructions for manual tests and the linked issue has appropriate QA labels, or tests are not needed
  • The PR has reviewed with UX and tested in light and dark mode, or there are no UX changes
  • The PR has been reviewed in terms of Accessibility
  • The PR has considered, and if applicable tested with, the three Global Roles Admin, Standard User and User Base

…reeze

- We now also track code freeze as milestone metadata
- Anyone can set code freeze state (not just repo admins)
- If a milestone is in code freeze block merges (the same permissions as usual allow force merge)
@richard-cox richard-cox added this to the v2.14.0 milestone Mar 4, 2026
@richard-cox richard-cox requested a review from Copilot March 4, 2026 15:14
@richard-cox richard-cox self-assigned this Mar 4, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the PR milestone validation automation to incorporate a “code freeze” state into the branch→milestone metadata, and to block merges when the target branch is marked as in code freeze.

Changes:

  • Changed branches-metadata.json milestone entries from a string to an object containing version and codeFreeze.
  • Updated the PR milestone checker script to read milestone.version and fail the check when milestone.codeFreeze is true.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
branches-metadata.json Extends branch milestone config to include version + codeFreeze metadata.
.github/workflows/scripts/pr-check-milestone.sh Reads the new milestone schema and blocks PRs targeting branches in code freeze.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@richard-cox richard-cox marked this pull request as ready for review March 4, 2026 16:30
Copy link
Copy Markdown
Member

@rak-phillip rak-phillip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

This will be good to test and validate for the upcoming code freeze.

@richard-cox richard-cox merged commit 7d087f0 into rancher:master Mar 5, 2026
117 of 123 checks passed
@richard-cox richard-cox deleted the update-pr-check-milestone branch March 5, 2026 09:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Wire in new milestone tracking to e2e-docker-start

3 participants