Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ci/check_and_fix_format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,5 @@ function fix {
trap fix ERR

ci/do_ci.sh check_format
ci/do_ci.sh check_repositories
ci/do_ci.sh check_spelling
ci/do_ci.sh check_spelling_pedantic
9 changes: 4 additions & 5 deletions ci/do_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -e


build_setup_args=""
if [[ "$1" == "format_pre" || "$1" == "fix_format" || "$1" == "check_format" || "$1" == "check_repositories" || \
if [[ "$1" == "format_pre" || "$1" == "fix_format" || "$1" == "check_format" || \
"$1" == "check_spelling" || "$1" == "fix_spelling" || "$1" == "bazel.clang_tidy" || "$1" == "tooling" || \
"$1" == "check_spelling_pedantic" || "$1" == "fix_spelling_pedantic" ]]; then
build_setup_args="-nofetch"
Expand Down Expand Up @@ -419,10 +419,6 @@ elif [[ "$CI_TARGET" == "check_format" ]]; then
"${ENVOY_SRCDIR}"/tools/code_format/check_format.py check
BAZEL_BUILD_OPTIONS="${BAZEL_BUILD_OPTIONS[*]}" "${ENVOY_SRCDIR}"/tools/proto_format/proto_format.sh check --test
exit 0
elif [[ "$CI_TARGET" == "check_repositories" ]]; then
echo "check_repositories..."
"${ENVOY_SRCDIR}"/tools/check_repositories.sh
exit 0
elif [[ "$CI_TARGET" == "check_spelling" ]]; then
echo "check_spelling..."
"${ENVOY_SRCDIR}"/tools/spelling/check_spelling.sh check
Expand All @@ -445,6 +441,7 @@ elif [[ "$CI_TARGET" == "docs" ]]; then
BAZEL_BUILD_OPTIONS="${BAZEL_BUILD_OPTIONS[*]}" "${ENVOY_SRCDIR}"/docs/build.sh
exit 0
elif [[ "$CI_TARGET" == "deps" ]]; then

echo "verifying dependencies..."
# Validate dependency relationships between core/extensions and external deps.
"${ENVOY_SRCDIR}"/tools/dependency/validate_test.py
Expand All @@ -455,6 +452,8 @@ elif [[ "$CI_TARGET" == "deps" ]]; then
bazel run "${BAZEL_BUILD_OPTIONS[@]}" //tools/dependency:cve_scan_test

# Validate repository metadata.
echo "check repositories..."
"${ENVOY_SRCDIR}"/tools/check_repositories.sh
"${ENVOY_SRCDIR}"/ci/check_repository_locations.sh

# Run pip requirements tests
Expand Down