From 7e5d854be726de9fdcb7acce4e42d52e8e19b411 Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Sun, 11 Oct 2020 10:03:55 -0700 Subject: [PATCH] ci: bring BAZEL_BUILD_OPTIONS back for format and docs (#13480) Signed-off-by: Lizan Zhou --- ci/do_ci.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/do_ci.sh b/ci/do_ci.sh index d9380c23cafd..4e908fd6aab4 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -369,21 +369,23 @@ elif [[ "$CI_TARGET" == "bazel.fuzz" ]]; then elif [[ "$CI_TARGET" == "fix_format" ]]; then # proto_format.sh needs to build protobuf. setup_clang_toolchain + echo "fix_format..." ./tools/code_format/check_format.py fix ./tools/code_format/format_python_tools.sh fix - ./tools/proto_format/proto_format.sh fix --test + BAZEL_BUILD_OPTIONS="${BAZEL_BUILD_OPTIONS[*]}" ./tools/proto_format/proto_format.sh fix --test exit 0 elif [[ "$CI_TARGET" == "check_format" ]]; then # proto_format.sh needs to build protobuf. setup_clang_toolchain + echo "check_format_test..." ./tools/code_format/check_format_test_helper.sh --log=WARN echo "check_format..." ./tools/code_format/check_shellcheck_format.sh ./tools/code_format/check_format.py check ./tools/code_format/format_python_tools.sh check - ./tools/proto_format/proto_format.sh check --test + BAZEL_BUILD_OPTIONS="${BAZEL_BUILD_OPTIONS[*]}" ./tools/proto_format/proto_format.sh check --test exit 0 elif [[ "$CI_TARGET" == "check_repositories" ]]; then echo "check_repositories..." @@ -411,7 +413,7 @@ elif [[ "$CI_TARGET" == "docs" ]]; then tools/dependency/validate_test.py tools/dependency/validate.py # Build docs. - docs/build.sh + BAZEL_BUILD_OPTIONS="${BAZEL_BUILD_OPTIONS[*]}" docs/build.sh exit 0 elif [[ "$CI_TARGET" == "verify_examples" ]]; then echo "verify examples..."