Skip to content

Commit

Permalink
remove bazel shutdown command (#2209) (#2246)
Browse files Browse the repository at this point in the history
  • Loading branch information
yxue authored and Joshua Blatt committed May 29, 2019
1 parent 56242cd commit 364c9e9
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 364c9e9

Please sign in to comment.