Skip to content

Commit 017d410

Browse files
authored
Fix docker/lint.sh after apache#10933. (apache#11541)
1 parent aff1312 commit 017d410

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

docker/lint.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
source "$(dirname $0)/dev_common.sh"
2121

2222
SCRIPT_NAME="$0"
23-
DEFAULT_STEPS=( file_type asf cpplint clang_format pylint python_format jnilint cppdocs mypy )
23+
DEFAULT_STEPS=( file_type asf clang_format cpplint python_format pylint jnilint cppdocs mypy )
2424

2525
inplace_fix=0
2626

@@ -43,12 +43,12 @@ function run_lint_step() {
4343
;;
4444
clang_format)
4545
if [ $inplace_fix -eq 0 ]; then
46-
cmd=( tests/lint/clang_format.sh )
46+
cmd=( tests/lint/git-clang-format.sh )
4747
else
4848
# NOTE: need to run git status to update some docker-side cache. Otherwise,
4949
# git-clang-format will fail with "The following files would be modified but have
5050
# unstaged changes:"
51-
cmd=( bash -c 'git status &>/dev/null && tests/lint/git-clang-format.sh -i origin/main' )
51+
cmd=( bash -c 'git status &>/dev/null && tests/lint/git-clang-format.sh -i --rev origin/main' )
5252
fi
5353
;;
5454
cpplint)
@@ -62,9 +62,9 @@ function run_lint_step() {
6262
;;
6363
python_format)
6464
if [ $inplace_fix -eq 0 ]; then
65-
cmd=( tests/lint/python_format.sh )
65+
cmd=( tests/lint/git-black.sh )
6666
else
67-
cmd=( tests/lint/git-black.sh -i origin/main )
67+
cmd=( tests/lint/git-black.sh -i --rev origin/main )
6868
fi
6969
;;
7070
jnilint)

0 commit comments

Comments
 (0)