From 024b27acde05ff94fb94322b0643e3d64cb108fa Mon Sep 17 00:00:00 2001 From: Ricky Stewart Date: Tue, 19 Jul 2022 13:49:33 -0500 Subject: [PATCH] ci: only build `roachprod` on Unix This fails to build on Windows which was breaking CI. Release note: None --- build/teamcity/cockroach/ci/builds/build_impl.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build/teamcity/cockroach/ci/builds/build_impl.sh b/build/teamcity/cockroach/ci/builds/build_impl.sh index c7e940fb4b32..98d414f4f667 100755 --- a/build/teamcity/cockroach/ci/builds/build_impl.sh +++ b/build/teamcity/cockroach/ci/builds/build_impl.sh @@ -10,8 +10,9 @@ fi CONFIG="$1" -# Extra targets to build on Linux x86_64 only. EXTRA_TARGETS= + +# Extra targets to build on Linux x86_64 only. if [ "$CONFIG" == "crosslinux" ] then DOC_TARGETS=$(grep '^//' docs/generated/bazel_targets.txt) @@ -20,10 +21,15 @@ then EXTRA_TARGETS="$DOC_TARGETS $GO_TARGETS $BINARY_TARGETS" fi +# Extra targets to build on Unix only. +if [ "$CONFIG" != "crosswindows" ] +then + EXTRA_TARGETS="$EXTRA_TARGETS //pkg/cmd/roachprod" +fi + bazel build //pkg/cmd/bazci --config=ci $(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci --compilation_mode opt \ --config "$CONFIG" --config ci --config with_ui \ build //pkg/cmd/cockroach-short //pkg/cmd/cockroach \ //pkg/cmd/cockroach-sql \ - //pkg/cmd/roachprod \ //pkg/cmd/cockroach-oss //c-deps:libgeos $EXTRA_TARGETS