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

[7.17](backport #37870) Fix libbeat BK crosscompile step #37881

Merged
merged 3 commits into from
Feb 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 6, 2024

This is an automatic backport of pull request #37870 done by Mergify.
Cherry-pick of a21051d has failed:

On branch mergify/bp/7.17/pr-37870
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit a21051d440.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/scripts/Makefile

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit a21051d)

# Conflicts:
#	libbeat/scripts/Makefile
@mergify mergify bot requested a review from a team as a code owner February 6, 2024 14:32
@mergify mergify bot requested review from belimawr and rdner and removed request for a team February 6, 2024 14:32
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 6, 2024
@mergify mergify bot assigned sharbuz Feb 6, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 6, 2024
@botelastic
Copy link

botelastic bot commented Feb 6, 2024

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

@sharbuz sharbuz enabled auto-merge (squash) February 6, 2024 14:48
@elasticmachine
Copy link
Collaborator

elasticmachine commented Feb 6, 2024

💚 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 preview

Expand to view the summary

Build stats

  • Duration: 76 min 5 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@sharbuz sharbuz merged commit 3616bac into 7.17 Feb 6, 2024
72 of 73 checks passed
@sharbuz sharbuz deleted the mergify/bp/7.17/pr-37870 branch February 6, 2024 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request 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