chore: use bazelisk (#474)

secretflow · Mar 3, 2025 · 866f428 · 866f428
1 parent a77a451
commit 866f428
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/.circleci/regtest-config.yml b/.circleci/regtest-config.yml
@@ -47,11 +47,11 @@ jobs:
       - run:
           name: "Build binary"
           command: |
-            set +e 
+            set +e
             mkdir -p image
             cp docker/scql-ubuntu.Dockerfile image
             docker run -d -it --name scql-dev -v $(pwd):/home/admin/dev/ -w /home/admin/dev --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --cap-add=NET_ADMIN --privileged=true --entrypoint=bash secretflow/scql-ci:latest
-            docker exec -it scql-dev bash -c "make && bazel build //engine/exe:scqlengine -c opt --ui_event_filters=-info,-debug,-warning" 
+            docker exec -it scql-dev bash -c "make && bazelisk build //engine/exe:scqlengine -c opt --ui_event_filters=-info,-debug,-warning"
 
             MACHINE_TYPE=`arch`
             if [ ${MACHINE_TYPE} == 'x86_64' ]; then
@@ -87,7 +87,7 @@ jobs:
             cd .ci/docker-compose
             python3 -m pip install -r requirements.txt
             python3 setup.py
-            docker compose -p regtest up -d 
+            docker compose -p regtest up -d
             docker ps | grep regtest
       - run:
           name: "Run regtest"

diff --git a/.circleci/unittest-config.yml b/.circleci/unittest-config.yml
@@ -70,7 +70,7 @@ jobs:
           command: |
             set +e
             declare -i test_status
-            bazel --host_jvm_args=-Xmx8g test //engine/... -c opt --jobs=32 --ui_event_filters=-info,-debug,-warning --test_output=errors | tee test_result.log; test_status=${PIPESTATUS[0]}
+            bazelisk --host_jvm_args=-Xmx8g test //engine/... -c opt --jobs=32 --ui_event_filters=-info,-debug,-warning --test_output=errors | tee test_result.log; test_status=${PIPESTATUS[0]}
 
             sh ../devtools/rename-junit-xml.sh
             find bazel-bin/ -executable -type f -name "*_test"  -print0 | xargs -0 tar -cvzf test_binary.tar.gz
@@ -129,7 +129,7 @@ jobs:
           command: |
             set +e
             declare -i test_status
-            bazel --host_jvm_args=-Xmx8g test //engine/... --jobs=32 --ui_event_filters=-info,-debug,-warning --test_output=errors| tee test_result.log; test_status=${PIPESTATUS[0]}
+            bazelisk --host_jvm_args=-Xmx8g test //engine/... --jobs=32 --ui_event_filters=-info,-debug,-warning --test_output=errors| tee test_result.log; test_status=${PIPESTATUS[0]}
 
             sh ../devtools/rename-junit-xml.sh
             find bazel-bin/ -perm +111 -type f -name "*_test"  -print0 | xargs -0 tar -cvzf test_binary.tar.gz

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -59,13 +59,13 @@ docker exec -it scql-dev-$(whoami) bash
 ```sh
 
 # build SCQL engine as release
-bazel build //engine/exe:scqlengine -c opt
+bazelisk build //engine/exe:scqlengine -c opt
 
 # run unittests for SCQL engine
-bazel test //engine/...
+bazelisk test //engine/...
 
 # build with address sanitizer
-bazel build --config=asan //engine/exe:scqlengine
+bazelisk build --config=asan //engine/exe:scqlengine
 
 # build scdb code
 make
@@ -86,4 +86,4 @@ make doc
 
 # Build documentation in Chinese
 make doc-cn
-```
+```
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ binary: clean prepare fmt vet gogenerate
 	$(eval SCQL_VERSION := $(shell bash ${PWD}/version_build.sh))
 	echo "Binary version: ${SCQL_VERSION}"
 	GOBIN=${PWD}/bin go install -ldflags "-X main.version=${SCQL_VERSION}" ./cmd/...
-	bazel --host_jvm_args=-Xmx8g build //engine/exe:scqlengine -c opt --jobs=32
+	bazelisk --host_jvm_args=-Xmx8g build //engine/exe:scqlengine -c opt --jobs=32
 	bash ${PWD}/version_build.sh -r
 
 pb: clean
@@ -89,5 +89,3 @@ GO-package:
 	GOBIN=${TOOLBIN} go install github.com/mattn/goveralls@latest && \
 	GOBIN=${TOOLBIN} go install github.com/rakyll/gotest@latest && \
 	GOBIN=${TOOLBIN} go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow@latest
-
-
diff --git a/api/generate_proto.sh b/api/generate_proto.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 set -e
-bazel build --remote_cache="" //api:scql_go_proto //api:spu_go_proto
+bazelisk build --remote_cache="" //api:scql_go_proto //api:spu_go_proto
 mkdir -p pkg/proto-gen/scql
 proto_gen_package=github.com/secretflow/scql/pkg/proto-gen
 # copy files execpt spu.pb.go

diff --git a/contrib/agent/proto/generate_proto.sh b/contrib/agent/proto/generate_proto.sh
@@ -15,6 +15,6 @@
 # limitations under the License.
 #
 set -e
-bazel build --remote_cache="" //contrib/agent/proto:task_config_go_proto
+bazelisk build --remote_cache="" //contrib/agent/proto:task_config_go_proto
 cp -f bazel-bin/contrib/agent/proto/task_config_go_proto_/github.com/secretflow/scql/contrib/agent/proto/task_config.pb.go contrib/agent/proto/task_config.pb.go
 chmod -R -x+X contrib/agent/proto