-
Notifications
You must be signed in to change notification settings - Fork 233
Add Previous Minor Branch to Security Fix Backports #8840
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.
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
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This PR introduces automated backporting to three branches (current minor, previous minor, and previous major) for security fixes, replacing the previous two-branch approach. The implementation uses YAML anchors/aliases for branch version management and adds automated branch variable updates during version bumps.
Key Changes:
- Added
previous_minorbranch variable to security fix backport targets - Automated mergify.yml branch variable updates in version-bump.yaml pipeline
- Moved branch variable updates to execute immediately after release branch creation
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| common/config/azure-pipelines/jobs/version-bump.yaml | Added automated mergify.yml update step after release branch creation; removed manual minor release update logic; updated job dependency conditions |
| .github/mergify.yml | Introduced YAML anchor/alias variables for branch names; added previous_minor branch to backport targets |
Co-authored-by: Copilot <[email protected]>
hl662
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should manually edit mergify.yml branch names one more time before we use version bump pipeline on 5.7 next month
Co-authored-by: Nam Le <[email protected]>
Co-authored-by: Nam Le <[email protected]>
This PR adds the ability to accommodate automatically backporting to a previous minor branch as well as the current minor and previous major. This is accomplished by adding the previous minor branch to the backport rule in mergify.yml as well as updating the logic in version-bump.yaml to update the branch names on version bumps.
The branch names have been moved to being held in variables at the top of the mergify.yaml file to accommodate major version bumps. In that case, the previous minor variable can be updated to
nullas stated in the instructions for a major version bump in version-bump.yaml. Note that as a pure yaml file,mergify.ymlmust use anchors and aliases to define variables as simpler variable definitions are not supported in pure yaml (as they are in azure devops pipeline definition yaml files for example).The branch name update logic has also been moved within
version-bump.yamlto be completed as soon as a new release branch is created, and it will immediately be pushed to master. Note that there is alsocontinueOnError: trueon this step so that a failure in updating the mergify branch names does not interfere with completing the more important version bump.