Skip to content
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

mergify: support for some backport aliases #17217

Merged
merged 3 commits into from
Mar 5, 2025

Conversation

v1v
Copy link
Member

@v1v v1v commented Mar 4, 2025

this should help with backporting to the current active branches

without knowing the active minor but using the major one

Release notes

What does this PR do?

Maybe this is solved already, but is there a way we can get an automatically kept up to date “backport-active-minors” label that auto backports to the set of minor releases that are still supported? I’d want this in Beats, Elastic Agent, and Fleet Server if it already exists. I’ve noticed an increase in forgotten backports because there are more releases to keep track of. If we can abstract this it’d make life easier, I think Kibana does something like this

We, observability robots team, are responsible for keeping those aliases in sync - we are working on the automation for that.

Why is it important/What is the impact to the user?

Enable backport-active-all, backport-active-8 and backport-active-9 GitHub labels in Mergify to backport to a set of active branches in addition to the existing automation with the backport-<major>.<minor> labels. This can help with the current 6 active branches, which we have today.

Therefore, if a PR takes longer to be merged, these aliases can help avoid the burden of updating the backport-[major].[minor] labels.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files (and/or docker env variables)
  • I have added tests that prove my fix is effective or that my feature works

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

this should help with backporting to the current active branches

without knowing the active minor but using the major one
@v1v v1v self-assigned this Mar 4, 2025
Copy link

mergify bot commented Mar 4, 2025

This pull request does not have a backport label. Could you fix it @v1v? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
  • backport-8.x is the label to automatically backport to the 8.x branch.

Copy link

mergify bot commented Mar 4, 2025

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label.

@mergify mergify bot added backport-8.x Automated backport to the 8.x branch with mergify and removed backport-skip backport-8.x Automated backport to the 8.x branch with mergify labels Mar 4, 2025
Copy link

mergify bot commented Mar 4, 2025

This pull request does not have a backport label. Could you fix it @v1v? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
  • backport-8.x is the label to automatically backport to the 8.x branch.

Copy link

mergify bot commented Mar 4, 2025

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Mar 4, 2025
@v1v v1v added backport-skip and removed backport-8.x Automated backport to the 8.x branch with mergify labels Mar 4, 2025
@v1v v1v requested review from dliappis and robbavey March 5, 2025 16:36
Copy link

mergify bot commented Mar 5, 2025

This pull request is now in conflicts. Could you fix it @v1v? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b feature/support-active-all-aliases-mergify upstream/feature/support-active-all-aliases-mergify
git merge upstream/main
git push upstream feature/support-active-all-aliases-mergify

@v1v v1v requested a review from mashhurs March 5, 2025 19:20
Copy link
Contributor

@mashhurs mashhurs left a comment

Choose a reason for hiding this comment

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

This is awesome! Thank you so much.

@v1v v1v merged commit f4ca06c into elastic:main Mar 5, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants