Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 20, 2025

Proposed commit message

Golang Crossbuild:

  • for arm64 let's use the aarch64 host
  • for amd64 let's use the amd64 host

We changed partially for aarch64, but darwin/arm64 was not changed.

Uses elastic/golang-crossbuild#533 and elastic/golang-crossbuild#559 (1.24.0)

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

In the CI:

See #43145

Related issues

Requires elastic/golang-crossbuild#533

Use cases

Screenshots

Logs


This is an automatic backport of pull request #43280 done by [Mergify](https://mergify.com).

(cherry picked from commit f2a3902)

# Conflicts:
#	.buildkite/auditbeat/auditbeat-pipeline.yml
#	.buildkite/filebeat/filebeat-pipeline.yml
#	.buildkite/heartbeat/heartbeat-pipeline.yml
#	.buildkite/metricbeat/pipeline.yml
#	.buildkite/packetbeat/pipeline.packetbeat.yml
#	.buildkite/winlogbeat/pipeline.winlogbeat.yml
#	.buildkite/x-pack/pipeline.xpack.agentbeat.yml
#	.buildkite/x-pack/pipeline.xpack.auditbeat.yml
#	.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
#	.buildkite/x-pack/pipeline.xpack.filebeat.yml
#	.buildkite/x-pack/pipeline.xpack.heartbeat.yml
#	.buildkite/x-pack/pipeline.xpack.metricbeat.yml
#	.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
#	.buildkite/x-pack/pipeline.xpack.packetbeat.yml
#	.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 20, 2025
@mergify mergify bot requested a review from a team as a code owner March 20, 2025 18:46
@mergify mergify bot assigned v1v Mar 20, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Mar 20, 2025

Cherry-pick of f2a3902 has failed:

On branch mergify/bp/8.x/pr-43280
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit f2a390242.
  (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)

Changes to be committed:
	modified:   .buildkite/packaging.pipeline.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/auditbeat/auditbeat-pipeline.yml
	both modified:   .buildkite/filebeat/filebeat-pipeline.yml
	both modified:   .buildkite/heartbeat/heartbeat-pipeline.yml
	both modified:   .buildkite/metricbeat/pipeline.yml
	both modified:   .buildkite/packetbeat/pipeline.packetbeat.yml
	both modified:   .buildkite/winlogbeat/pipeline.winlogbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.agentbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.auditbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.filebeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.heartbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.metricbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.osquerybeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.packetbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.winlogbeat.yml

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 20, 2025
@botelastic
Copy link

botelastic bot commented Mar 20, 2025

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

@v1v
Copy link
Member

v1v commented Mar 20, 2025

Requires #43245

@v1v v1v closed this Mar 20, 2025
@v1v v1v deleted the mergify/bp/8.x/pr-43280 branch March 20, 2025 21:45
@v1v v1v restored the mergify/bp/8.x/pr-43280 branch March 20, 2025 21:46
@v1v v1v reopened this Mar 20, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Mar 20, 2025

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 mergify/bp/8.x/pr-43280 upstream/mergify/bp/8.x/pr-43280
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-43280

@v1v v1v removed the conflicts There is a conflict in the backported pull request label Mar 20, 2025
@v1v v1v enabled auto-merge (squash) March 20, 2025 22:14
@v1v v1v requested a review from pkoutsovasilis March 20, 2025 22:14
@v1v v1v merged commit 8f746dd into 8.x Mar 20, 2025
130 checks passed
@v1v v1v deleted the mergify/bp/8.x/pr-43280 branch March 20, 2025 23:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants