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

Test fix for BK packaging failure #39155

Closed
wants to merge 3 commits into from
Closed

Test fix for BK packaging failure #39155

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06b58bf
Test fix for BK packaging failure
dliappis Apr 23, 2024
708a5ef
Additional fix
dliappis Apr 23, 2024
08910e9
Switch condition for setting docker platform
alexsapran Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev-tools/mage/crossbuild.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ func (b GolangCrossBuilder) Build() error {

args = append(args,
"--rm",
"--env", "GOFLAGS=-mod=readonly -buildvcs=false",
"--env", "'GOFLAGS=-mod=readonly -buildvcs=false'",
"--env", "MAGEFILE_VERBOSE="+verbose,
"--env", "MAGEFILE_TIMEOUT="+EnvOr("MAGEFILE_TIMEOUT", ""),
"--env", fmt.Sprintf("SNAPSHOT=%v", Snapshot),
Expand All @@ -339,7 +339,7 @@ func (b GolangCrossBuilder) Build() error {
// This fixes an issue where during arm64 linux build for the currently used docker image
// docker.elastic.co/beats-dev/golang-crossbuild:1.21.9-arm the image for amd64 arch is pulled
// and causes problems when using native arch tools on the binaries that are built for arm64 arch.
if strings.HasPrefix(b.Platform, "linux/") {
if runtime.GOOS == "linux" && runtime.GOARCH == "arm64" {
args = append(args,
"--platform", b.Platform,
)
Expand Down
Loading