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 backport-major.minor #40716

Merged
merged 7 commits into from
Sep 11, 2024

Conversation

v1v
Copy link
Member

@v1v v1v commented Sep 9, 2024

Proposed commit message

We have agreed to use backport-<major>.<minor> GitHub labels rather than backport-v<major>.<minor>.0 so the same GH label strategy works for the ingest and observability projects.

I decided to keep the current minor versions with the support for both 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
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@v1v v1v requested review from pierrehilbert, cmacknz, jlind23 and a team September 9, 2024 19:44
@v1v v1v self-assigned this Sep 9, 2024
@v1v v1v requested a review from a team as a code owner September 9, 2024 19:44
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 9, 2024
@botelastic
Copy link

botelastic bot commented Sep 9, 2024

This pull request doesn't have a Team:<team> label.

Copy link
Contributor

mergify bot commented Sep 9, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @v1v? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

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

.mergify.yml Outdated Show resolved Hide resolved
.mergify.yml Outdated Show resolved Hide resolved
.mergify.yml Outdated Show resolved Hide resolved
Copy link
Contributor

mergify bot commented Sep 10, 2024

This pull request is now in conflicts. Could you fix it? 🙏
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/update-backport-mergify upstream/feature/update-backport-mergify
git merge upstream/main
git push upstream feature/update-backport-mergify

@v1v v1v enabled auto-merge (squash) September 10, 2024 18:17
Copy link
Contributor

mergify bot commented Sep 10, 2024

This pull request is now in conflicts. Could you fix it? 🙏
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/update-backport-mergify upstream/feature/update-backport-mergify
git merge upstream/main
git push upstream feature/update-backport-mergify

@v1v v1v merged commit 3a5cd59 into elastic:main Sep 11, 2024
10 checks passed
mergify bot pushed a commit that referenced this pull request Sep 11, 2024
(cherry picked from commit 3a5cd59)

# Conflicts:
#	.mergify.yml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants