Skip to content

Commit e36b76f

Browse files
committed
build: Rename 'check' and 'fix' targets
Now that we have new targets 'tidy' and 'tidy-fix', rename the old clang-format targets 'check' and 'fix' as 'format' and 'format-fix', respectively. Signed-off-by: Jarno Rajahalme <[email protected]>
1 parent 8ba5893 commit e36b76f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ENV TARGETARCH=$TARGETARCH
100100
#
101101
# Check format
102102
#
103-
RUN BAZEL_BUILD_OPTS="${BAZEL_BUILD_OPTS}" PKG_BUILD=1 V=$V DEBUG=$DEBUG make V=1 check > format-output.txt
103+
RUN BAZEL_BUILD_OPTS="${BAZEL_BUILD_OPTS}" PKG_BUILD=1 V=$V DEBUG=$DEBUG make V=1 format > format-output.txt
104104

105105
FROM scratch AS format
106106
COPY --from=check-format /cilium/proxy/format-output.txt /

Makefile.dev

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ tidy-fix: compile_commands.json force-non-root
6666
echo "clang-tidy fix results can contain duplicate includes, check before committing!"
6767
run-clang-tidy-17 -fix -format -style=file -quiet -extra-arg="-Wno-unknown-pragmas" -checks=misc-include-cleaner -j $(TIDY_JOBS) $(TIDY_SOURCES)
6868

69-
check: force-non-root
69+
format: force-non-root
7070
$(BAZEL) $(BAZEL_OPTS) run $(BAZEL_BUILD_OPTS) @envoy//tools/code_format:check_format -- --path "$(PWD)" --skip_envoy_build_rule_check --add-excluded-prefixes $(FORMAT_EXCLUDED_PREFIXES) --bazel_tools_check_excluded_paths="./" --build_fixer_check_excluded_paths="./" check || echo "Format check failed, run 'make fix' locally to fix formatting errors."
7171

72-
fix: force-non-root
72+
format-fix: force-non-root
7373
$(BAZEL) $(BAZEL_OPTS) run $(BAZEL_BUILD_OPTS) @envoy//tools/code_format:check_format -- --path "$(PWD)" --skip_envoy_build_rule_check --add-excluded-prefixes $(FORMAT_EXCLUDED_PREFIXES) --bazel_tools_check_excluded_paths="." --build_fixer_check_excluded_paths="./" fix
7474

7575
# Run tests without debug by default.

0 commit comments

Comments
 (0)