Merge #104780 #104922

104780: schemachanger: add doc.go r=postamar a=postamar Fixes #104779. Release note: None 104922: bazel: remove `with_ui` configuration r=rail a=rickystewart Epic: none Release note: None Co-authored-by: Marius Posta <[email protected]> Co-authored-by: Ricky Stewart <[email protected]>
cockroachdb · Jun 15, 2023 · 3e8657a · 3e8657a
3 parents dba700b + c063b43 + 8bcffd0
commit 3e8657a
Show file tree

Hide file tree

Showing 19 changed files with 353 additions and 159 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/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/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
@@ -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
@@ -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
@@ -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...)