diff --git a/BUILD.bazel b/BUILD.bazel index f63e8c8a85..a142069715 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -63,16 +63,6 @@ config_setting( }, ) -# This is a dummy target so Make can "blaze build --announce_rc -# Where something truly does nothing that we may care about. - -config_setting( - name = "dummy_setting", - define_values = { - "whatever": "whatever", - }, -) - gazelle( name = "gazelle", build_tags = select({ diff --git a/Makefile b/Makefile index f34413c519..2a8a30acae 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ lint-go-bazel: $(info ==> $@) @tools/quiet bazel test --config lint //... -GO_BUILD_TAGS_ARG=$(shell bazel build --ui_event_filters=-stdout,-stderr --announce_rc --noshow_progress :dummy_setting 2>&1 | grep "'build' options" | sed -n "s/^.*--define gotags=\(\S*\).*/--build-tags \1/p" ) +GO_BUILD_TAGS_ARG=$(shell bazel info --announce_rc 2>&1 | grep "'build' options" | sed -n "s/^.*--define gotags=\(\S*\).*/--build-tags \1/p" ) lint-go-golangci: $(info ==> $@) diff --git a/tools/update_testdata.sh b/tools/update_testdata.sh index 1d4874a31b..2d458f6020 100755 --- a/tools/update_testdata.sh +++ b/tools/update_testdata.sh @@ -10,7 +10,7 @@ folders=$(grep \ --exclude-dir=bazel-\* \ "xtest.UpdateGoldenFiles()" . | xargs dirname | sort | uniq ) -GO_BUILD_TAGS_ARG=$(bazel build --ui_event_filters=-stdout,-stderr --announce_rc --noshow_progress :dummy_setting 2>&1 | grep "'build' options" | sed -n "s/^.*--define gotags=\(\S*\).*/-tags \1/p") +GO_BUILD_TAGS_ARG=$(bazel info --announce_rc 2>&1 | grep "'build' options" | sed -n "s/^.*--define gotags=\(\S*\).*/-tags \1/p") echo $folders -update | xargs go test ${GO_BUILD_TAGS_ARG} echo $folders -count=1 | xargs go test ${GO_BUILD_TAGS_ARG}