From 8bcffd063aa26d5eddc4c8069b051a645406c3f4 Mon Sep 17 00:00:00 2001 From: Ricky Stewart Date: Thu, 8 Jun 2023 14:41:31 -0500 Subject: [PATCH 1/2] bazel: remove `with_ui` configuration Epic: none Release note: None --- .bazelrc | 2 - .../cockroach/ci/builds/build_impl.sh | 2 +- build/teamcity/cockroach/nightlies/compose.sh | 4 +- .../nightlies/roachtest_compile_bits.sh | 4 +- dev | 2 +- pkg/cmd/dev/build.go | 9 -- pkg/cmd/dev/testdata/datadriven/dev-build | 2 +- pkg/cmd/dev/testdata/datadriven/ui | 6 +- pkg/cmd/dev/ui.go | 1 - pkg/cmd/publish-artifacts/main_test.go | 70 +++++------ .../main_test.go | 118 +++++++++--------- pkg/obsservice/README.md | 5 +- pkg/release/build.go | 2 +- pkg/ui/BUILD.bazel | 14 --- pkg/ui/distccl/BUILD.bazel | 14 +-- pkg/ui/distoss/BUILD.bazel | 14 +-- 16 files changed, 111 insertions(+), 158 deletions(-) diff --git a/.bazelrc b/.bazelrc index 8af2d3ca3657..450f873f3d6f 100644 --- a/.bazelrc +++ b/.bazelrc @@ -20,7 +20,6 @@ build --flag_alias=dev=//build/toolchains:dev_flag build --flag_alias=force_build_cdeps=//build/toolchains:force_build_cdeps_flag build --flag_alias=lintonbuild=//build/toolchains:nogo_flag build --flag_alias=nolintonbuild=//build/toolchains:nonogo_explicit_flag -build --flag_alias=with_ui=//pkg/ui:with_ui_flag build:crdb_test_off --crdb_test_off build:cross --cross @@ -31,7 +30,6 @@ build:nolintonbuild --nolintonbuild # Note: nonogo is classically the name of the nolintonbuild configuration. build:nonogo --nolintonbuild build:test --crdb_test -build:with_ui --with_ui # Basic settings. build --define gotags=bazel,gss diff --git a/build/teamcity/cockroach/ci/builds/build_impl.sh b/build/teamcity/cockroach/ci/builds/build_impl.sh index 7d42fe8775c0..678bd195b067 100755 --- a/build/teamcity/cockroach/ci/builds/build_impl.sh +++ b/build/teamcity/cockroach/ci/builds/build_impl.sh @@ -36,7 +36,7 @@ fi bazel build //pkg/cmd/bazci --config=ci BAZEL_BIN=$(bazel info bazel-bin --config=ci) "$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci" -- build -c opt \ - --config "$CONFIG" --config ci --config with_ui $EXTRA_ARGS \ + --config "$CONFIG" --config ci $EXTRA_ARGS \ //pkg/cmd/cockroach-short //pkg/cmd/cockroach \ //pkg/cmd/cockroach-sql \ //pkg/cmd/cockroach-oss //c-deps:libgeos $EXTRA_TARGETS diff --git a/build/teamcity/cockroach/nightlies/compose.sh b/build/teamcity/cockroach/nightlies/compose.sh index 27cc90749b38..e6a775f79362 100755 --- a/build/teamcity/cockroach/nightlies/compose.sh +++ b/build/teamcity/cockroach/nightlies/compose.sh @@ -12,8 +12,8 @@ bazel build //pkg/cmd/bazci --config=ci BAZEL_BIN=$(bazel info bazel-bin --config=ci) BAZCI=$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci -bazel build //pkg/cmd/cockroach //pkg/compose/compare/compare:compare_test --config=ci --config=crosslinux --config=test --config=with_ui -CROSSBIN=$(bazel info bazel-bin --config=ci --config=crosslinux --config=test --config=with_ui) +bazel build //pkg/cmd/cockroach //pkg/compose/compare/compare:compare_test --config=ci --config=crosslinux --config=test +CROSSBIN=$(bazel info bazel-bin --config=ci --config=crosslinux --config=test) COCKROACH=$CROSSBIN/pkg/cmd/cockroach/cockroach_/cockroach COMPAREBIN=$CROSSBIN/pkg/compose/compare/compare/compare_test_/compare_test ARTIFACTS_DIR=$PWD/artifacts diff --git a/build/teamcity/cockroach/nightlies/roachtest_compile_bits.sh b/build/teamcity/cockroach/nightlies/roachtest_compile_bits.sh index ebba39ee3682..a05afff428c7 100644 --- a/build/teamcity/cockroach/nightlies/roachtest_compile_bits.sh +++ b/build/teamcity/cockroach/nightlies/roachtest_compile_bits.sh @@ -26,7 +26,7 @@ for platform in "${cross_builds[@]}"; do echo "Building $platform, os=$os, arch=$arch..." # Build cockroach, workload and geos libs. - bazel build --config $platform --config ci --config with_ui -c opt --config force_build_cdeps \ + bazel build --config $platform --config ci -c opt --config force_build_cdeps \ //pkg/cmd/cockroach //pkg/cmd/workload \ //c-deps:libgeos # N.B. roachtest is currently executed only on a TC agent running linux/amd64, so we build it once. @@ -36,7 +36,7 @@ for platform in "${cross_builds[@]}"; do # Build cockroach-short with assertions enabled. bazel build --config $platform --config ci -c opt //pkg/cmd/cockroach-short --crdb_test # Copy the binaries. - BAZEL_BIN=$(bazel info bazel-bin --config $platform --config ci --config with_ui -c opt) + BAZEL_BIN=$(bazel info bazel-bin --config $platform --config ci -c opt) # N.B. currently, we support only one roachtest binary, so elide the suffix. if [[ $os == "linux" && $arch == "amd64" ]]; then cp $BAZEL_BIN/pkg/cmd/roachtest/roachtest_/roachtest bin/roachtest diff --git a/dev b/dev index 2936f62eecd0..5918b546e474 100755 --- a/dev +++ b/dev @@ -8,7 +8,7 @@ fi set -euo pipefail # Bump this counter to force rebuilding `dev` on all machines. -DEV_VERSION=75 +DEV_VERSION=76 THIS_DIR=$(cd "$(dirname "$0")" && pwd) BINARY_DIR=$THIS_DIR/bin/dev-versions diff --git a/pkg/cmd/dev/build.go b/pkg/cmd/dev/build.go index 76e03401e294..ce6aa35b0965 100644 --- a/pkg/cmd/dev/build.go +++ b/pkg/cmd/dev/build.go @@ -444,15 +444,6 @@ func (d *dev) getBasicBuildArgs( } } - // Add --config=with_ui iff we're building a target that needs it. - for _, target := range buildTargets { - if target.fullName == buildTargetMapping["cockroach"] || - target.fullName == buildTargetMapping["cockroach-oss"] || - target.fullName == buildTargetMapping["obsservice"] { - args = append(args, "--config=with_ui") - break - } - } if shouldBuildWithTestConfig { args = append(args, "--config=test") } diff --git a/pkg/cmd/dev/testdata/datadriven/dev-build b/pkg/cmd/dev/testdata/datadriven/dev-build index 8eb0f29ead6c..075e909a1ff1 100644 --- a/pkg/cmd/dev/testdata/datadriven/dev-build +++ b/pkg/cmd/dev/testdata/datadriven/dev-build @@ -49,7 +49,7 @@ cp sandbox/pkg/cmd/cockroach-short/cockroach-short_/cockroach-short crdb-checkou exec dev build -- --verbose_failures --sandbox_debug ---- -bazel build //pkg/cmd/cockroach:cockroach --config=with_ui --verbose_failures --sandbox_debug --build_event_binary_file=/tmp/path +bazel build //pkg/cmd/cockroach:cockroach --verbose_failures --sandbox_debug --build_event_binary_file=/tmp/path bazel info workspace --color=no mkdir crdb-checkout/bin bazel info bazel-bin --color=no diff --git a/pkg/cmd/dev/testdata/datadriven/ui b/pkg/cmd/dev/testdata/datadriven/ui index 1ba5cd9d7405..49d68b9408cc 100644 --- a/pkg/cmd/dev/testdata/datadriven/ui +++ b/pkg/cmd/dev/testdata/datadriven/ui @@ -157,7 +157,7 @@ dev ui e2e bazel info workspace --color=no bazel info workspace --color=no yarn --silent --cwd crdb-checkout/pkg/ui/workspaces/e2e-tests install -bazel build //pkg/cmd/cockroach:cockroach --config=with_ui +bazel build //pkg/cmd/cockroach:cockroach yarn --silent --cwd crdb-checkout/pkg/ui/workspaces/e2e-tests cypress install crdb-checkout/pkg/ui/workspaces/e2e-tests/build/start-crdb-then.sh yarn --silent --cwd crdb-checkout/pkg/ui/workspaces/e2e-tests cy:run @@ -167,7 +167,7 @@ dev ui e2e ./foo/bar bazel info workspace --color=no bazel info workspace --color=no yarn --silent --cwd crdb-checkout/pkg/ui/workspaces/e2e-tests install -bazel build //pkg/cmd/cockroach:cockroach --config=with_ui +bazel build //pkg/cmd/cockroach:cockroach yarn --silent --cwd crdb-checkout/pkg/ui/workspaces/e2e-tests cypress install crdb-checkout/pkg/ui/workspaces/e2e-tests/build/start-crdb-then.sh yarn --silent --cwd crdb-checkout/pkg/ui/workspaces/e2e-tests cy:run ./foo/bar @@ -177,7 +177,7 @@ dev ui e2e --headed bazel info workspace --color=no bazel info workspace --color=no yarn --silent --cwd crdb-checkout/pkg/ui/workspaces/e2e-tests install -bazel build //pkg/cmd/cockroach:cockroach --config=with_ui +bazel build //pkg/cmd/cockroach:cockroach yarn --silent --cwd crdb-checkout/pkg/ui/workspaces/e2e-tests cypress install crdb-checkout/pkg/ui/workspaces/e2e-tests/build/start-crdb-then.sh yarn --silent --cwd crdb-checkout/pkg/ui/workspaces/e2e-tests cy:debug diff --git a/pkg/cmd/dev/ui.go b/pkg/cmd/dev/ui.go index a667e98044e3..d7ee6f66c3cf 100644 --- a/pkg/cmd/dev/ui.go +++ b/pkg/cmd/dev/ui.go @@ -569,7 +569,6 @@ launching test in a real browser. Extra flags are passed directly to the buildCockroachArgv := []string{ "build", "//pkg/cmd/cockroach:cockroach", - "--config=with_ui", } logCommand("bazel", buildCockroachArgv...) err = d.exec.CommandContextInheritingStdStreams(ctx, "bazel", buildCockroachArgv...) diff --git a/pkg/cmd/publish-artifacts/main_test.go b/pkg/cmd/publish-artifacts/main_test.go index 330ce7a25cfa..58e6e32f8b62 100644 --- a/pkg/cmd/publish-artifacts/main_test.go +++ b/pkg/cmd/publish-artifacts/main_test.go @@ -119,7 +119,7 @@ func (r *mockExecRunner) run(c *exec.Cmd) ([]byte, error) { platform = release.PlatformWindows path += ".exe" pathSQL += ".exe" - case "ci", "force_build_cdeps", "with_ui": + case "ci", "force_build_cdeps": default: panic(fmt.Sprintf("Unexpected configuration %s", arg)) } @@ -166,138 +166,138 @@ func TestPublish(t *testing.T) { }, expectedCmds: []string{ "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64 version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --config=ci", "env=[] args=bazel info bazel-bin -c opt --config=crosslinuxbase --config=ci", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64-fips version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64-fips", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -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", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", "env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxarmbase --config=ci", "env=[] args=bazel info bazel-bin -c opt --config=crosslinuxarmbase --config=ci", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosarmbase", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -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", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", }, expectedPuts: []string{ "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach.linux-gnu-amd64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-amd64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-amd64.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-amd64.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/workload.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --config=ci", "gs://edge-binaries-bucket/cockroach/workload.LATEST/no-cache REDIRECT /cockroach/workload.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64-fips.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64-fips.LATEST/no-cache REDIRECT /cockroach/cockroach.linux-gnu-amd64-fips.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64-fips.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64-fips.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-amd64-fips.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64-fips.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64-fips.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-amd64-fips.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64-fips.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64-fips.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-amd64-fips.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-arm64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxarmbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-arm64.LATEST/no-cache REDIRECT /cockroach/cockroach.linux-gnu-arm64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-arm64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxarmbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-arm64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-arm64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-arm64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxarmbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-arm64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-arm64.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-arm64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxarmbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-arm64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-arm64.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/workload.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxarmbase --config=ci", "gs://edge-binaries-bucket/cockroach/workload.LATEST/no-cache REDIRECT /cockroach/workload.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach.darwin-amd64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", + "-c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", "gs://edge-binaries-bucket/cockroach/cockroach.darwin-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach.darwin-amd64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-amd64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", + "-c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.darwin-amd64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/lib/libgeos.darwin-amd64.1234567890abcdef.dylib CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", + "-c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos.darwin-amd64.dylib.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.darwin-amd64.1234567890abcdef.dylib", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.darwin-amd64.1234567890abcdef.dylib CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", + "-c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.darwin-amd64.dylib.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.darwin-amd64.1234567890abcdef.dylib", - "gs://edge-binaries-bucket/cockroach/cockroach.darwin-arm64.unsigned.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosarmbase", + "gs://edge-binaries-bucket/cockroach/cockroach.darwin-arm64.unsigned.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", "gs://edge-binaries-bucket/cockroach/cockroach.darwin-arm64.unsigned.LATEST/no-cache REDIRECT /cockroach/cockroach.darwin-arm64.unsigned.1234567890abcdef", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-arm64.unsigned.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosarmbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-arm64.unsigned.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-arm64.unsigned.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.darwin-arm64.unsigned.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach.windows-amd64.1234567890abcdef.exe CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosswindowsbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", "gs://edge-binaries-bucket/cockroach/cockroach.windows-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach.windows-amd64.1234567890abcdef.exe", "gs://edge-binaries-bucket/cockroach/cockroach-sql.windows-amd64.1234567890abcdef.exe CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosswindowsbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", "gs://edge-binaries-bucket/cockroach/cockroach-sql.windows-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.windows-amd64.1234567890abcdef.exe", "gs://edge-binaries-bucket/cockroach/lib/libgeos.windows-amd64.1234567890abcdef.dll CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosswindowsbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos.windows-amd64.dll.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.windows-amd64.1234567890abcdef.dll", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.windows-amd64.1234567890abcdef.dll CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosswindowsbase", + "-c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.windows-amd64.dll.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.windows-amd64.1234567890abcdef.dll", }, }, diff --git a/pkg/cmd/publish-provisional-artifacts/main_test.go b/pkg/cmd/publish-provisional-artifacts/main_test.go index 709d37c6e961..c361be55bd42 100644 --- a/pkg/cmd/publish-provisional-artifacts/main_test.go +++ b/pkg/cmd/publish-provisional-artifacts/main_test.go @@ -125,7 +125,7 @@ func (r *mockExecRunner) run(c *exec.Cmd) ([]byte, error) { platform = release.PlatformWindows path += ".exe" pathSQL += ".exe" - case "ci", "force_build_cdeps", "with_ui": + case "ci", "force_build_cdeps": default: panic(fmt.Sprintf("Unexpected configuration %s", arg)) } @@ -174,27 +174,27 @@ func TestProvisional(t *testing.T) { }, expectedCmds: []string{ "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary release' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64 version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary release' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary release' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64-fips version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary release' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary release' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosarmbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=." + - "/build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary 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 //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary 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", + "/build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", }, expectedGets: nil, expectedPuts: []string{ @@ -235,27 +235,27 @@ func TestProvisional(t *testing.T) { }, expectedCmds: []string{ "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64 version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64-fips version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosarmbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=." + - "/build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary release injected-tag' -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 //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary release injected-tag' -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", + "/build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", }, expectedGets: nil, expectedPuts: []string{ @@ -297,107 +297,107 @@ func TestProvisional(t *testing.T) { expectedCmds: []string{ "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=." + - "/build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", + "/build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64 version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64-fips version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=with_ui --config" + + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config" + "=crossmacosarmbase", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -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", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -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", + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", }, expectedGets: nil, expectedPuts: []string{ "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64.00SHA00 " + "CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp." + - "sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", + "sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64.LATEST/no-cache " + "REDIRECT /cockroach/cockroach.linux-gnu-amd64.00SHA00", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-amd64.00SHA00", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64.00SHA00." + "so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-amd64.00SHA00.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64.00SHA00." + "so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-amd64.00SHA00.so", - "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64-fips.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", + "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64-fips.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64-fips.LATEST/no-cache REDIRECT /cockroach/cockroach.linux-gnu-amd64-fips.00SHA00", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64-fips.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64-fips.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64-fips.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-amd64-fips.00SHA00", - "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64-fips.00SHA00.so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", + "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64-fips.00SHA00.so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64-fips.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-amd64-fips.00SHA00.so", - "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64-fips.00SHA00.so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxfipsbase", + "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64-fips.00SHA00.so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64-fips.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-amd64-fips.00SHA00.so", "gs://edge-binaries-bucket/cockroach/cockroach.darwin-amd64.00SHA00 " + "CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", "gs://edge-binaries-bucket/cockroach/cockroach.darwin-amd64.LATEST/no-cache " + "REDIRECT /cockroach/cockroach.darwin-amd64.00SHA00", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-amd64.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-amd64.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql." + "darwin-amd64.00SHA00", "gs://edge-binaries-bucket/cockroach/lib/libgeos.darwin-amd64.00SHA00." + "dylib CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos.darwin-amd64.dylib.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.darwin-amd64.00SHA00.dylib", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.darwin-amd64.00SHA00." + "dylib CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp." + - "sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosbase", + "sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.darwin-amd64.dylib.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.darwin-amd64.00SHA00.dylib", - "gs://edge-binaries-bucket/cockroach/cockroach.darwin-arm64.unsigned.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosarmbase", + "gs://edge-binaries-bucket/cockroach/cockroach.darwin-arm64.unsigned.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", "gs://edge-binaries-bucket/cockroach/cockroach.darwin-arm64.unsigned.LATEST/no-cache REDIRECT /cockroach/cockroach.darwin-arm64.unsigned.00SHA00", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-arm64.unsigned.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crossmacosarmbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-arm64.unsigned.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-arm64.unsigned.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.darwin-arm64.unsigned.00SHA00", "gs://edge-binaries-bucket/cockroach/cockroach.windows-amd64.00SHA00.exe " + "CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp." + - "sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosswindowsbase", + "sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", "gs://edge-binaries-bucket/cockroach/cockroach.windows-amd64.LATEST/no-cache " + "REDIRECT /cockroach/cockroach.windows-amd64.00SHA00.exe", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.windows-amd64.00SHA00.exe CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosswindowsbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.windows-amd64.00SHA00.exe CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", "gs://edge-binaries-bucket/cockroach/cockroach-sql.windows-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.windows-amd64.00SHA00.exe", "gs://edge-binaries-bucket/cockroach/lib/libgeos.windows-amd64.00SHA00." + "dll CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosswindowsbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos.windows-amd64.dll.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.windows-amd64.00SHA00.dll", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.windows-amd64.00SHA00." + "dll CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosswindowsbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.windows-amd64.dll.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.windows-amd64.00SHA00.dll", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-arm64.00SHA00 " + "CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp." + - "sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxarmbase", + "sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-arm64.LATEST/no-cache " + "REDIRECT /cockroach/cockroach.linux-gnu-arm64.00SHA00", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-arm64.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxarmbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-arm64.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-arm64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-arm64.00SHA00", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-arm64.00SHA00." + "so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxarmbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-arm64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-arm64.00SHA00.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-arm64.00SHA00." + "so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=with_ui --config=crosslinuxarmbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-arm64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-arm64.00SHA00.so", }, }, diff --git a/pkg/obsservice/README.md b/pkg/obsservice/README.md index 545236259ddc..bfa0622ccbd5 100644 --- a/pkg/obsservice/README.md +++ b/pkg/obsservice/README.md @@ -17,8 +17,7 @@ Build with ./dev build obsservice ``` -which will include the DB Console UI served on the HTTP port. This adds the -`"--config=with_ui"` bazel flag that embeds the UI. +which will include the DB Console UI served on the HTTP port. You can also build without the UI using: @@ -80,7 +79,7 @@ exporters: In the current fledgling state, the Obs Service does a couple of things: -1. The Obs Service serves the DB Console, when built with `--config=with_ui`. +1. The Obs Service serves the DB Console. 2. The Obs Service reverse-proxies some HTTP routes to CRDB (`/_admin/`, `/_status/`, `/ts/`, `/api/v2/`). diff --git a/pkg/release/build.go b/pkg/release/build.go index 20e99a67ac03..f579eea51077 100644 --- a/pkg/release/build.go +++ b/pkg/release/build.go @@ -178,7 +178,7 @@ func MakeRelease(platform Platform, opts BuildOptions, pkgDir string) error { stampCommand = fmt.Sprintf("--workspace_status_command=./build/bazelutil/stamp.sh %s %s", targetTriple, opts.Channel) } buildArgs = append(buildArgs, stampCommand) - configs := []string{"-c", "opt", "--config=ci", "--config=force_build_cdeps", "--config=with_ui", fmt.Sprintf("--config=%s", CrossConfigFromPlatform(platform))} + configs := []string{"-c", "opt", "--config=ci", "--config=force_build_cdeps", fmt.Sprintf("--config=%s", CrossConfigFromPlatform(platform))} buildArgs = append(buildArgs, configs...) cmd := exec.Command("bazel", buildArgs...) cmd.Dir = pkgDir diff --git a/pkg/ui/BUILD.bazel b/pkg/ui/BUILD.bazel index 958621d39e0c..5bf17319c2e7 100644 --- a/pkg/ui/BUILD.bazel +++ b/pkg/ui/BUILD.bazel @@ -19,20 +19,6 @@ go_library( ], ) -bool_flag( - name = "with_ui_flag", - build_setting_default = False, - visibility = ["//visibility:public"], -) - -config_setting( - name = "with_ui", - flag_values = { - ":with_ui_flag": "true", - }, - visibility = ["//visibility:public"], -) - genrule( name = "gen-empty-index.html", outs = ["index.html"], diff --git a/pkg/ui/distccl/BUILD.bazel b/pkg/ui/distccl/BUILD.bazel index ae4642884080..386df03bb39d 100644 --- a/pkg/ui/distccl/BUILD.bazel +++ b/pkg/ui/distccl/BUILD.bazel @@ -2,19 +2,9 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") genrule( name = "genassets", - srcs = select({ - "//pkg/ui:with_ui": ["//pkg/ui/workspaces/db-console:db-console-ccl"], - "//conditions:default": ["//pkg/ui:gen-empty-index.html"], - }), + srcs = ["//pkg/ui/workspaces/db-console:db-console-ccl"], outs = ["assets.tar.gz"], - cmd = """ -if [ -d $< ] -then - $(location //pkg/util/targz/gen) $ Date: Tue, 13 Jun 2023 10:53:14 -0400 Subject: [PATCH 2/2] schemachanger: add doc.go Fixes #104779. Release note: None --- pkg/BUILD.bazel | 1 + pkg/sql/schemachanger/BUILD.bazel | 9 +- pkg/sql/schemachanger/doc.go | 233 ++++++++++++++++++++++++++++++ 3 files changed, 242 insertions(+), 1 deletion(-) create mode 100644 pkg/sql/schemachanger/doc.go diff --git a/pkg/BUILD.bazel b/pkg/BUILD.bazel index c9901c32885c..610d2ad1ae8e 100644 --- a/pkg/BUILD.bazel +++ b/pkg/BUILD.bazel @@ -1969,6 +1969,7 @@ GO_TARGETS = [ "//pkg/sql/schemachanger/sctest/sctestgen:sctestgen", "//pkg/sql/schemachanger/sctest/sctestgen:sctestgen_lib", "//pkg/sql/schemachanger/sctest:sctest", + "//pkg/sql/schemachanger:schemachanger", "//pkg/sql/schemachanger:schemachanger_test", "//pkg/sql/scrub/scrubtestutils:scrubtestutils", "//pkg/sql/scrub:scrub", diff --git a/pkg/sql/schemachanger/BUILD.bazel b/pkg/sql/schemachanger/BUILD.bazel index 2a611ca0fa2b..1e3dc3b57dab 100644 --- a/pkg/sql/schemachanger/BUILD.bazel +++ b/pkg/sql/schemachanger/BUILD.bazel @@ -1,5 +1,5 @@ load("//build/bazelutil/unused_checker:unused.bzl", "get_x_data") -load("@io_bazel_rules_go//go:def.bzl", "go_test") +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") load("//pkg/sql/schemachanger/sctest/sctestgen:gen.bzl", "sctest_gen") filegroup( @@ -103,4 +103,11 @@ sctest_gen( ], ) +go_library( + name = "schemachanger", + srcs = ["doc.go"], + importpath = "github.com/cockroachdb/cockroach/pkg/sql/schemachanger", + visibility = ["//visibility:public"], +) + get_x_data(name = "get_x_data") diff --git a/pkg/sql/schemachanger/doc.go b/pkg/sql/schemachanger/doc.go new file mode 100644 index 000000000000..34daff06bdd7 --- /dev/null +++ b/pkg/sql/schemachanger/doc.go @@ -0,0 +1,233 @@ +// Copyright 2023 The Cockroach Authors. +// +// Use of this software is governed by the Business Source License +// included in the file licenses/BSL.txt. +// +// As of the Change Date specified in that file, in accordance with +// the Business Source License, use of this software will be governed +// by the Apache License, Version 2.0, included in the file +// licenses/APL.txt. + +package schemachanger + +// The schemachanger package and its descendents contain the declarative schema +// changer. This machinery is the latest iteration of how CockroachDB performs +// schema changes, in contrast with the so-called legacy schema changer. This +// doc file provides a high-level overview of its architecture, the aim being to +// provide a useful introduction to the code and the design decisions behind +// it. +// +// # Similarities and differences with the legacy schema changer +// +// The main challenge that any schema changer in CockroachDB must solve is to +// perform these correctly while maintaining the "online" property: tables must +// remain accessible to concurrent queries while they undergo schema changes. +// Online schema changes are enabled by upholding the 2-version invariant, see +// docs/RFCS/20151014_online_schema_change.md for details. This necessarily +// implies that schema changes may require multiple transactions to complete. +// Upholding correctness requires maintaining: +// - atomicity: when executing multiple DDL statements in one transaction, +// either all of them succeed or all of them fail; +// - isolation: any side effects of an ongoing schema change must +// remain invisible to concurrent queries until the schema change completes +// successfully. +// This implies that schema changes which fail must be rolled back somehow. +// Schema changes may legitimately fail, typically when adding a constraint on a +// nonempty table. However, we want these rollbacks to always succeed. +// +// In CockroachDB, both in the legacy and in the declarative schema changer, for +// schema changes involving more than one transaction. this sequence of +// transactions is driven by a job; of type SCHEMA_CHANGE or +// TYPEDESC_SCHEMA_CHANGE for the legacy schema changer, NEW_SCHEMA_CHANGE for +// the declarative schema changer. In both cases the schema change gets rolled +// back when the job's `Resume` method encounters an error, after which its +// `OnFailOrCancel` method takes over and eventually transitions the job to the +// `failed` terminal state. Both schema changers also have in common the fact +// that they store the current state and targeted end-state of an ongoing schema +// change inside the affected descriptor, but here the similarities end: for the +// legacy schema changer, this state is encoded in the descriptor protobuf's +// `mutations` slice; for the declarative schema changer, it's +// `declarative_schema_changer_state`. +// +// Due to its design the legacy schema changer is unable to deal with certain +// situations correctly. Consider for example: +// +// CREATE TABLE t (a INT, b INT); +// INSERT INTO t VALUES (1, 1), (2, 1); +// BEGIN; +// ALTER TABLE t DROP COLUMN a; +// CREATE UNIQUE INDEX ON t(b); +// COMMIT; +// +// The legacy schema changer will correctly raise a constraint violation error +// (code 23505) however will be unable to roll back the schema change +// correctly: +// +// > SELECT * FROM t; +// b | a +// ----+------- +// 1 | NULL +// 1 | NULL +// (2 rows) +// +// The declarative schema changer, on the other hand, does so: +// +// > SELECT * FROM t; +// a | b +// ----+---- +// 1 | 1 +// 2 | 1 +// (2 rows) +// +// # The element model +// +// The declarative schema changer models its persisted state in terms of +// elements, which can be thought of as "things" on which a schema change can be +// performed, typically leaves of a DDL statement's AST: e.g. a table's name is +// modeled as an element called TableName, a column's default value expression +// is modelled by ColumnDefaultExpression, and so forth. +// +// A schema change is defined by setting target statuses to a set of +//elements. +// These statuses are PUBLIC, ABSENT or TRANSIENT_ABSENT. This is best described +// by example; `ALTER TABLE foo RENAME COLUMN x TO y`, assuming `foo` has +// descriptor ID 123 and `x` has column ID 4, gets translated into: +// - ColumnName{DescID: 123, ColumnID: 4, Name: x} targets ABSENT, +// - ColumnName{DescID: 123, ColumnID: 4, Name: y} targets PUBLIC. +// +// When the schema change starts, those two elements are respectively in the +// PUBLIC and ABSENT statuses. Performing the schema change means transitioning +// these to their target status. This may include intermediate statuses, this +// isn't the case for ColumnName but a Column transitions through DELETE_ONLY, +// WRITE_ONLY, etc. because of the need to uphold the 2-version invariant. +// Elements and statuses are defined in `scpb`. The mapping of the descriptor +// model (i.e. what's in system.descriptor) to the element model (which is what +// the declarative schema changer understands) is defined and implemented in +// `scdecomp`. The mapping of DDL ASTs to elements and targets is defined and +// implemented in `scbuild/internal/scbuildstmt`. +// +// # Status transition operations +// +// Status changes are effected by performing operations, which can be grouped +// into three types, defined in `scop`: +// - MutationType is the most common and consists of schema metadata operations +// which mutate the contents of the system.descriptor, system.namespace, +// system.zone, etc. tables. To follow on the previous example, transitioning +// ColumnName from ABSENT to PUBLIC will involve executing the SetColumnName +// operation, which will use the catalog API to mutate the table descriptor +// by overwriting the `name` field in the corresponding column descriptor. +// - BackfillType involves backfilling and merging indexes. +// - ValidationType involves validating constraints. +// +// These operations are defined in `scop` and are implemented in `scexec/...`. +// The mapping of element status transitions to operations is defined in +// `scplan/internal/opgen`. +// +// # Planning a schema change +// +// As mentioned earlier, we need to uphold the 2-version invariant, which means +// that some elements cannot transition from ABSENT to PUBLIC or vice-versa in +// one transaction. For example, a CREATE INDEX statement will result in a +// SecondaryIndex element targeting PUBLIC. Its initial status will be ABSENT +// (the index doesn't exist yet, after all) but it will reach PUBLIC by +// transitioning through DELETE_ONLY and WRITE_ONLY among many other statuses in +// distinct transactions. +// +// We model these status transitions as a directed acyclical graph, in which +// each node is an (element, target status, current status) tuple and status +// transitions are edges between nodes sharing the same (element, target status) +// pairs. We denote these as op-edges because these edges are decorated with the +// sequence of operations to effect the status transition. Constraints on status +// transitions, such as the 2-version invariant, are modeled as dependency +// edges, or dep-edges, in the graph. These edges are decorated with constraints +// which need to be satisfied. In the case of the 2-version invariant, the +// constraint is `PreviousTransactionPrecedence`, which imposes that the status +// transitions must reach the origin node before the destination node and more +// importantly must do so in separate transactions. +// +// Planning a schema change therefore boils down to generating the corresponding +// DAG and identifying a graph partition which satisfies all dep-edge +// constraints. The graph object itself is defined in `scplan/internal/scgraph`, +// the nodes and the op-edges are generated using `scplan/internal/opgen`, the +// dep-edges between those nodes are generated using +// `scplan/internal/rules/...`, and the partitioning is implemented in +// `scplan/internal/scstage`. Unsurprisingly, the `scplan` package ties all of +// this together. +// +// # Rules +// +// Generating these dep-edges is non-trivial and, practically speaking, requires +// a vast quantity of complex code. This deserves further commentary. +// +// A graph will typically have a lot of dep-edges. Think for instance of a DROP +// DATABASE statement operating on a database with a good many tables in it, +// each table will easily have a few dozen elements and in such a DROP these +// will all have target ABSENT. There will be dep-edges to ensure that, for +// instance, a table name is not removed from system.namespace before the table +// descriptor's `state` field is set to `DROP`. +// +// These edges need to be generated programmatically, and rather than doing so +// in an imperative fashion, we have chosen to define them declaratively, in the +// form of rules. These rules are essentially predicates which can be applied to +// any pair of nodes to determine whether there should be a dep-edge between +// those to. See `scplan/internal/rules/current` for the latest set of rules. +// +// The advantage of this approach is that the rules can be expressed +// using a high level of abstraction, making them easier to reason about and +// therefore less likely to have bugs. The disadvantage is that we needed to +// build what's essentially a mini-embedded RDBMS to apply these predicates +// efficiently, from a performance perspective. This database is implemented in +// `rel`. +// +// This is the reason why the element model is relational in nature. Each +// element has a set of attributes which uniquely identify it (defined in +// `screl`) and serve as a key. Elements can be joined on on other elements +// containing suitable references. For example, a ColumnName element can be +// joined with its corresponding Column element on `(DescID, ColumnID)` and with +// its Table element on `DescID`. +// +// These declarative rule definitions are at the heart of what makes this schema +// changer implementation different from the previous one, which is why we call +// it the _declarative_ schema changer. +// +// # Remaining packages of note and testing +// +// The previous sections have tried to give an overview of the important parts +// of the declarative schema changer. There remains a few things to be said +// about how it integrates with the rest of CockroachDB and how it's tested. +// +// Due to its largely self-contained nature and the need to thoroughly test each +// of its components we have relied heavily on dependency injection to enforce a +// clear interface between the declarative schema changer internals, which +// reason in terms of elements, and the rest of the codebase, which reasons in +// terms of descriptors, assumes access to the sql.planner, etc. +// +// The actual dependencies are quarantined in the `scdeps` package while the +// testing dependencies are in `scdeps/sctestdeps`. Both implement the same +// interfaces. +// +// The plumbing with the job machinery is encapsulated in `scjob` while the +// plumbing with the backup restore logic is in `scbackup`; `scrun ` essentially +// glues everything together to provide entry points into the declarative schema +// changer from outside. +// +// The `schemachanger_test` package mainly contains integration tests which +// perform data-driven end-to-end testing of the declarative schema changer. See +// also `schemachangerccl_test` which is the same thing but quarantined in +// `pkg/ccl`, and `sctest/...` for common definitions. These integration tests +// operate on the following basis. After some initial setup, one or more DDL +// statements are provided. These are fed into the declarative schema changer +// and each test verifies its behavior with respect to a specific thing: +// - TestEndToEndSideEffects verifies that the side effects are as +// expected, it does so by injecting test dependencies in the whole +// framework; this also checks EXPLAIN (DDL) diagrams; +// - TestRollback tests schema changer behavior with respect to errors thrown +// at any point during the schema change where one may legitimately be +// expected; +// - TestBackup tests behavior after restoring a backup performed at any point +// during the ongoing schema change; +// - TestPause tests behavior after pausing the schema change job; +// - and so forth... +// +// Finally `corpus` is used to test declarative schema changer behavior in +// mixed-version clusters.