Skip to content

[7.17](backport #34939) filebeat/scripts/mage - Remove installation of journald deps from crossBuild#34953

Merged
andrewkroh merged 1 commit into
7.17from
mergify/bp/7.17/pr-34939
Mar 28, 2023
Merged

[7.17](backport #34939) filebeat/scripts/mage - Remove installation of journald deps from crossBuild#34953
andrewkroh merged 1 commit into
7.17from
mergify/bp/7.17/pr-34939

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Mar 28, 2023

This is an automatic backport of pull request #34939 done by Mergify.
Cherry-pick of 192be24 has failed:

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

You are currently cherry-picking commit 192be249d1.
  (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:   filebeat/scripts/mage/build.go

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/github/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

@mergify mergify Bot requested a review from a team as a code owner March 28, 2023 14:11
@mergify mergify Bot removed the request for review from a team March 28, 2023 14:11
@mergify mergify Bot added the backport label Mar 28, 2023
@mergify mergify Bot requested a review from ycombinator March 28, 2023 14:11
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Mar 28, 2023
@mergify mergify Bot requested a review from cmacknz March 28, 2023 14:11
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 28, 2023
@botelastic
Copy link
Copy Markdown

botelastic Bot commented Mar 28, 2023

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

…ssBuild (#34939)

The golang-crossbuild images contain the journald development dependencies so
the build steps do not need make changes to the environment before building.

Fixes #34938

(cherry picked from commit 192be24)
@elasticmachine
Copy link
Copy Markdown
Contributor

💚 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

  • Start Time: 2023-03-28T14:13:57.585+0000

  • Duration: 73 min 1 sec

Test stats 🧪

Test Results
Failed 0
Passed 3651
Skipped 380
Total 4031

💚 Flaky test report

Tests succeeded.

🤖 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!)

@andrewkroh andrewkroh merged commit fcc91c7 into 7.17 Mar 28, 2023
@andrewkroh andrewkroh deleted the mergify/bp/7.17/pr-34939 branch March 28, 2023 16:06
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 :Packaging Packaging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants