Skip to content

Commit

Permalink
makefile: not use bazel_parpare in check-bazel-prepare (#43831)
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkingrei authored May 15, 2023
1 parent 8ea388f commit 575d3bb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,10 @@ generate_grafana_scripts:

bazel_ci_prepare:
bazel $(BAZEL_GLOBAL_CONFIG) run $(BAZEL_CMD_CONFIG) //:gazelle
bazel $(BAZEL_GLOBAL_CONFIG) run $(BAZEL_CMD_CONFIG) //:gazelle -- update-repos -from_file=go.mod -to_macro DEPS.bzl%go_deps -build_file_proto_mode=disable
bazel $(BAZEL_GLOBAL_CONFIG) run $(BAZEL_CMD_CONFIG) \
--run_under="cd $(CURDIR) && " \
//tools/tazel:tazel

bazel_prepare:
bazel run //:gazelle
Expand Down
2 changes: 1 addition & 1 deletion tools/check/check-bazel-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
set -euo pipefail

before_checksum=`find . -type f \( -name *.bazel -o -name *.bzl \) -exec md5sum {} \;| sort -k 2`
make bazel_prepare
make bazel_ci_prepare
after_checksum=`find . -type f \( -name *.bazel -o -name *.bzl \) -exec md5sum {} \;| sort -k 2`
if [ "$before_checksum" != "$after_checksum" ]
then
Expand Down

0 comments on commit 575d3bb

Please sign in to comment.