Skip to content

mergify: support backport label for 9.0 branch #4816

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

Merged
merged 4 commits into from
Apr 16, 2025

Conversation

v1v
Copy link
Member

@v1v v1v commented Feb 5, 2025

Description

What is the problem this PR solves?

As we doing it in new way using github action, we just add support for 9.0 now and notification for backport-active labels.
Implementation for backport-active labels will be done in follow up PR right after that one will be merged. Like it was done for elastic-agent: elastic/elastic-agent#7814

How does this PR solve the problem?

Updating mergify config for backporting to 9.0 branch using label.

Documentation sets edited in this PR

Check all that apply.

  • Stateful (docs/en/observability/*)
  • Serverless (docs/en/serverless/*)
  • Integrations Developer Guide (docs/en/integrations/*)
  • None of the above

Related issue

Closes #

Checklist

  • Product/Engineering Review
  • Writer Review

Follow-up tasks

Select one.

  • This PR does not need to be ported to another doc set because:
    • The concepts in this PR only apply to one doc set (serverless or stateful)
    • The PR contains edits to both doc sets (serverless and stateful)
  • This PR needs to be ported to another doc set:
    • Port to stateful docs: <link to PR or tracking issue>
    • Port to serverless docs: <link to PR or tracking issue>

@v1v v1v requested a review from a team as a code owner February 5, 2025 12:55
Copy link
Contributor

mergify bot commented Feb 5, 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-/d./d is the label to automatically backport to the /d./d branch. /d is the digit
    NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Feb 5, 2025
Copy link
Contributor

mergify bot commented Apr 11, 2025

This pull request is now in conflict. 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/mergify-support-backport-active-minors upstream/feature/mergify-support-backport-active-minors
git merge upstream/main
git push upstream feature/mergify-support-backport-active-minors

@ev1yehor
Copy link
Contributor

@v1v I removed part for backport-active labels, we can merge it and I will create follow up for it using gh action.

@ev1yehor
Copy link
Contributor

@elastic/obs-docs

@v1v
Copy link
Member Author

v1v commented Apr 14, 2025

@ev1yehor, since you removed a few commits, could you revisit the PR title and description to reflect what you're actually doing?

@bmorelli25 bmorelli25 self-requested a review April 14, 2025 20:19
@ev1yehor ev1yehor changed the title mergify: support backport-active-8, backport-active-9, backport-active-all mergify: support backport for 9.0 branch Apr 14, 2025
@ev1yehor ev1yehor changed the title mergify: support backport for 9.0 branch mergify: support backport label for 9.0 branch Apr 14, 2025
@v1v v1v enabled auto-merge (squash) April 15, 2025 13:40
@ev1yehor
Copy link
Contributor

@elastic/obs-docs

Copy link
Member

@bmorelli25 bmorelli25 left a comment

Choose a reason for hiding this comment

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

Thank you

@v1v v1v merged commit 5b98570 into elastic:main Apr 16, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-skip Skip notification from the automated backport with mergify needs-writer-review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants