From 693211a3d32bf442fe6158680b898ad8fb06e184 Mon Sep 17 00:00:00 2001 From: Loong Dai Date: Fri, 8 Apr 2022 16:23:44 +0000 Subject: [PATCH 1/2] ci: add contrib target Signed-off-by: Loong Dai --- ci/README.md | 2 ++ ci/do_ci.sh | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/ci/README.md b/ci/README.md index ebb76396d2836..0d534e85fdca4 100644 --- a/ci/README.md +++ b/ci/README.md @@ -115,6 +115,8 @@ The `./ci/run_envoy_docker.sh './ci/do_ci.sh '` targets are: * `bazel.debug.server_only` — build Envoy static binary under `-c dbg`. * `bazel.dev` — build Envoy static binary and run tests under `-c fastbuild` with clang. * `bazel.dev ` — build Envoy static binary and run a specified test or test dir under `-c fastbuild` with clang. +* `bazel.dev.contrib` — build Envoy static binary with contrib and run tests under `-c fastbuild` with clang. +* `bazel.dev.contrib ` — build Envoy static binary with contrib and run a specified test or test dir under `-c fastbuild` with clang. * `bazel.release` — build Envoy static binary and run tests under `-c opt` with clang. * `bazel.release ` — build Envoy static binary and run a specified test or test dir under `-c opt` with clang. * `bazel.release.server_only` — build Envoy static binary under `-c opt` with clang. diff --git a/ci/do_ci.sh b/ci/do_ci.sh index c3565ec7ac688..986d450d0e21b 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -322,6 +322,16 @@ elif [[ "$CI_TARGET" == "bazel.dev" ]]; then echo "Building..." bazel_envoy_binary_build fastbuild + echo "Testing ${TEST_TARGETS[*]}" + bazel test "${BAZEL_BUILD_OPTIONS[@]}" -c fastbuild "${TEST_TARGETS[@]}" + exit 0 +elif [[ "$CI_TARGET" == "bazel.dev.contrib" ]]; then + setup_clang_toolchain + # This doesn't go into CI but is available for developer convenience. + echo "bazel fastbuild build with tests..." + echo "Building..." + bazel_contrib_binary_build fastbuild + echo "Testing ${TEST_TARGETS[*]}" bazel test "${BAZEL_BUILD_OPTIONS[@]}" -c fastbuild "${TEST_TARGETS[@]}" exit 0 From 2ceeb9d6177e70ff2b59ece13ef2097d040b7ed8 Mon Sep 17 00:00:00 2001 From: Loong Dai Date: Fri, 8 Apr 2022 16:42:27 +0000 Subject: [PATCH 2/2] feedback Signed-off-by: Loong Dai --- ci/do_ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 986d450d0e21b..ad6e49e9ca722 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -328,7 +328,7 @@ elif [[ "$CI_TARGET" == "bazel.dev" ]]; then elif [[ "$CI_TARGET" == "bazel.dev.contrib" ]]; then setup_clang_toolchain # This doesn't go into CI but is available for developer convenience. - echo "bazel fastbuild build with tests..." + echo "bazel fastbuild build with contrib extensions and tests..." echo "Building..." bazel_contrib_binary_build fastbuild