From 78d1c5a0f52043ae9453d38b6039b21c6509e131 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Fri, 10 May 2019 14:08:54 -0400 Subject: [PATCH] remove bazel shutdown command (#2209) --- Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index bf1fe3d6e36..be0166338fb 100644 --- a/Makefile +++ b/Makefile @@ -33,30 +33,25 @@ CXX := clang++-7 endif PATH := /usr/lib/llvm-7/bin:$(PATH) +# Removed 'bazel shutdown' as it could cause CircleCI to hang build: PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) build $(BAZEL_BUILD_ARGS) $(BAZEL_TARGETS) - @bazel shutdown # Build only envoy - fast build_envoy: PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) build $(BAZEL_BUILD_ARGS) //src/envoy:envoy - @bazel shutdown clean: @bazel clean - @bazel shutdown test: PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) $(BAZEL_TARGETS) - @bazel shutdown test_asan: PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-asan -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS) - @bazel shutdown test_tsan: PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS) - @bazel shutdown check: @script/check-license-headers @@ -68,7 +63,6 @@ artifacts: build deb: CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) build $(BAZEL_BUILD_ARGS) //tools/deb:istio-proxy - @bazel shutdown .PHONY: build clean test check artifacts