From 8ba8b1e6a2ba3f1e98a4591c9eb665b3bdfbc108 Mon Sep 17 00:00:00 2001 From: Ricky Stewart Date: Fri, 12 Aug 2022 10:13:38 -0500 Subject: [PATCH] release: build linux-arm binary for release Release note (build change): build *experimental* Linux ARM64 binary Release justification: build *experimental* Linux ARM64 binary for release --- pkg/cmd/publish-provisional-artifacts/main.go | 5 +---- pkg/cmd/publish-provisional-artifacts/main_test.go | 8 ++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkg/cmd/publish-provisional-artifacts/main.go b/pkg/cmd/publish-provisional-artifacts/main.go index b65245b7a44a..5ddf204b2b98 100644 --- a/pkg/cmd/publish-provisional-artifacts/main.go +++ b/pkg/cmd/publish-provisional-artifacts/main.go @@ -154,10 +154,7 @@ func run(providers []release.ObjectPutGetter, flags runFlags, execFn release.Exe updateLatest = true } - platforms := []release.Platform{release.PlatformLinux, release.PlatformMacOS, release.PlatformWindows} - if !flags.isRelease { - platforms = append(platforms, release.PlatformLinuxArm) - } + platforms := []release.Platform{release.PlatformLinux, release.PlatformMacOS, release.PlatformWindows, release.PlatformLinuxArm} var cockroachBuildOpts []opts for _, platform := range platforms { var o opts diff --git a/pkg/cmd/publish-provisional-artifacts/main_test.go b/pkg/cmd/publish-provisional-artifacts/main_test.go index 18fffd3138ab..9fa76f3652d3 100644 --- a/pkg/cmd/publish-provisional-artifacts/main_test.go +++ b/pkg/cmd/publish-provisional-artifacts/main_test.go @@ -172,6 +172,8 @@ func TestProvisional(t *testing.T) { "'--workspace_status_command=." + "/build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary v0.0.1-alpha release' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosswindowsbase", "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosswindowsbase", + "env=[] args=bazel build //pkg/cmd/cockroach //c-deps:libgeos //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary v0.0.1-alpha release' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxarmbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxarmbase", }, expectedGets: nil, expectedPuts: []string{ @@ -188,6 +190,10 @@ func TestProvisional(t *testing.T) { "s3://binaries.cockroachdb.com/cockroach-v0.0.1-alpha.windows-6.2-amd64.zip.sha256sum CONTENTS ", "s3://binaries.cockroachdb.com/cockroach-sql-v0.0.1-alpha.windows-6.2-amd64.zip CONTENTS ", "s3://binaries.cockroachdb.com/cockroach-sql-v0.0.1-alpha.windows-6.2-amd64.zip.sha256sum CONTENTS ", + "s3://binaries.cockroachdb.com/cockroach-v0.0.1-alpha.linux-3.7.10-gnu-aarch64.tgz CONTENTS ", + "s3://binaries.cockroachdb.com/cockroach-v0.0.1-alpha.linux-3.7.10-gnu-aarch64.tgz.sha256sum CONTENTS ", + "s3://binaries.cockroachdb.com/cockroach-sql-v0.0.1-alpha.linux-3.7.10-gnu-aarch64.tgz CONTENTS ", + "s3://binaries.cockroachdb.com/cockroach-sql-v0.0.1-alpha.linux-3.7.10-gnu-aarch64.tgz.sha256sum CONTENTS ", }, }, { @@ -355,6 +361,8 @@ func TestBless(t *testing.T) { "REDIRECT cockroach-v0.0.1.windows-6.2-amd64.zip", "s3://binaries.cockroachdb.com/cockroach-latest.windows-6.2-amd64.zip.sha256sum/no-cache " + "REDIRECT cockroach-v0.0.1.windows-6.2-amd64.zip.sha256sum", + "s3://binaries.cockroachdb.com/cockroach-latest.linux-3.7.10-gnu-aarch64.tgz/no-cache REDIRECT cockroach-v0.0.1.linux-3.7.10-gnu-aarch64.tgz", + "s3://binaries.cockroachdb.com/cockroach-latest.linux-3.7.10-gnu-aarch64.tgz.sha256sum/no-cache REDIRECT cockroach-v0.0.1.linux-3.7.10-gnu-aarch64.tgz.sha256sum", }, }, }