Skip to content

[9.2] (backport #11054) Compile the Windows archive proxy for the target GOARCH instead of the host GOARCH #11174

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
Open
wants to merge 2 commits into
base: 9.2
Choose a base branch
from
Open

[9.2] (backport #11054) Compile the Windows archive proxy for the target GOARCH instead of the host GOARCH #11174

wants to merge 2 commits into from
+24 −15

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 13, 2025

When support for windows/arm builds was added in #9751 the Go archive proxy was switched from a fixed amd64 GOARCH to the host GOARCH. This works in CI which doesn't cross-compile for Windows but broke cross-compiling from darwin/arm64 to windows/amd64 for anyone on a Mac. This PR fixes that.

To test:

❯ EXTERNAL=true SNAPSHOT=true PACKAGES=zip PLATFORMS=windows/amd64,windows/arm64 mage package

# ...

❯ file build/distributions/elastic-agent-9.3.0-SNAPSHOT-windows-x86_64/elastic-agent.exe
build/distributions/elastic-agent-9.3.0-SNAPSHOT-windows-x86_64/elastic-agent.exe: PE32+ executable (console) x86-64, for MS Windows

❯ file build/distributions/elastic-agent-9.3.0-SNAPSHOT-windows-arm64/elastic-agent.exe
build/distributions/elastic-agent-9.3.0-SNAPSHOT-windows-arm64/elastic-agent.exe: PE32+ executable (console) Aarch64, for MS Windows

```<hr>This is an automatic backport of pull request #11054 done by [Mergify](https://mergify.com).

@cmacknz @ycombinator @mergify
Compile the Windows archive proxy for the target GOARCH instead of th…
c92154a 
…e host GOARCH (#11054)

* Compile the archive proxy for the target GOARCH isntead of the host
GOARCH.

* Update comment to match function name.

Co-authored-by: Shaunak Kashyap <[email protected]>

---------

Co-authored-by: Shaunak Kashyap <[email protected]>
(cherry picked from commit 318ad8f)
@mergify mergify bot added the backport label Nov 13, 2025
@mergify mergify bot requested a review from a team as a code owner November 13, 2025 21:41
@mergify mergify bot requested review from pchila and ycombinator and removed request for a team November 13, 2025 21:41
@mergify mergify bot added the backport label Nov 13, 2025
@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Nov 13, 2025
@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 13, 2025

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 13, 2025 •
edited
Loading

💔 Build Failed

Failed CI Steps

History

cc @cmacknz

@mergify mergify bot mentioned this pull request Nov 14, 2025
Merged
@mergify
Copy link
Contributor Author

mergify bot commented Nov 17, 2025

This pull request has not been merged yet. Could you please review and merge it @cmacknz? 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cmacknz cmacknz cmacknz approved these changes

@ycombinator ycombinator Awaiting requested review from ycombinator ycombinator is a code owner automatically assigned from elastic/elastic-agent-control-plane

@pchila pchila Awaiting requested review from pchila pchila is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@cmacknz cmacknz

Labels

backport skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@elasticmachine @cmacknz @ebeahan