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.

Sign up for GitHub

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

Jump to bottom

[mergify] allow backports in any direction #25787

Merged
merged 2 commits into from
May 20, 2021
Merged

[mergify] allow backports in any direction #25787

merged 2 commits into from
May 20, 2021

Conversation

v1v
Copy link
Member

@v1v v1v commented May 19, 2021 •
edited
Loading

What does this PR do?

Enable backports with mergify in any direction, even to the master branch if the backport happens from a release branch.

Why is it important?

Changes can be in any branch for different reasons. The development branches are master and 7.x (assuming master eventually diverges from 7.x).

Smaller docs changes directly come from release branches, these are normally forward ported to 7.x and master.

Backports can go in any direction

@v1v v1v added automation Team:Automation Label for the Observability productivity team labels May 19, 2021
@v1v v1v requested review from urso and a team May 19, 2021 12:42
@v1v v1v self-assigned this May 19, 2021
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels May 19, 2021
@v1v v1v requested review from ruflin, exekias and aleksmaus May 19, 2021 12:45
@elasticmachine
Copy link
Collaborator

elasticmachine commented May 19, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #25787 updated

  • Start Time: 2021-05-20T10:41:27.599+0000

  • Duration: 16 min 6 sec

  • Commit: 90dfda5

Trends 🧪

Image of Build Times

❕ Flaky test report

No test was executed to be analysed.

ruflin
ruflin approved these changes May 19, 2021
View reviewed changes
Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM

mdelapenya
mdelapenya reviewed May 19, 2021
View reviewed changes
.mergify.yml Outdated Show resolved Hide resolved
@v1v @mdelapenya
Update .mergify.yml
90dfda5 
Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
@v1v v1v merged commit 3934344 into elastic:master May 20, 2021
@v1v v1v deleted the feature/mergify-backport-in-any-direction branch May 20, 2021 11:01
@v1v v1v mentioned this pull request Jul 1, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mdelapenya mdelapenya mdelapenya left review comments

@ruflin ruflin ruflin approved these changes

@urso urso urso approved these changes

@exekias exekias Awaiting requested review from exekias

@aleksmaus aleksmaus Awaiting requested review from aleksmaus

Assignees

@v1v v1v

Labels
automation Team:Automation Label for the Observability productivity team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@v1v @elasticmachine @urso @ruflin @mdelapenya