Skip to content

[skip ci] Fix docker/lint.sh after #10933 #11541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jroesch merged 1 commit into from
Jun 2, 2022
Merged

[skip ci] Fix docker/lint.sh after #10933 #11541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions docker/lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
source "$(dirname $0)/dev_common.sh"

SCRIPT_NAME="$0"
DEFAULT_STEPS=( file_type asf cpplint clang_format pylint python_format jnilint cppdocs mypy )
DEFAULT_STEPS=( file_type asf clang_format cpplint python_format pylint jnilint cppdocs mypy )

inplace_fix=0

Expand All @@ -43,12 +43,12 @@ function run_lint_step() {
;;
clang_format)
if [ $inplace_fix -eq 0 ]; then
cmd=( tests/lint/clang_format.sh )
cmd=( tests/lint/git-clang-format.sh )
else
# NOTE: need to run git status to update some docker-side cache. Otherwise,
# git-clang-format will fail with "The following files would be modified but have
# unstaged changes:"
cmd=( bash -c 'git status &>/dev/null && tests/lint/git-clang-format.sh -i origin/main' )
cmd=( bash -c 'git status &>/dev/null && tests/lint/git-clang-format.sh -i --rev origin/main' )
fi
;;
cpplint)
Expand All @@ -62,9 +62,9 @@ function run_lint_step() {
;;
python_format)
if [ $inplace_fix -eq 0 ]; then
cmd=( tests/lint/python_format.sh )
cmd=( tests/lint/git-black.sh )
else
cmd=( tests/lint/git-black.sh -i origin/main )
cmd=( tests/lint/git-black.sh -i --rev origin/main )
fi
;;
jnilint)
Expand Down