From 605631ac2992176f7286409320a9971bb5b9cd69 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 18 Jun 2022 20:10:10 +0200 Subject: [PATCH] build(lint): set some linters as non-fatal #19018 luacheck and clint are the most important, and they are bundled. The others are nice-to-have, and not always available (and not bundled), so make them optional. This allows the "lint" target to function as a convenient and low-hassle handle for contributors. We still get the full power of lint in CI. TODO: bundle uncrustify (and then set it as required for "lint")? --- CMakeLists.txt | 4 ++-- src/nvim/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51124de96a..2224ddd5c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -625,11 +625,11 @@ if(STYLUA_PRG) else() add_custom_command(OUTPUT lintlua-cmd APPEND COMMAND ${CMAKE_COMMAND} -E echo "STYLUA_PRG not found") endif() -def_cmd_target(lintpy ${FLAKE8_PRG} FLAKE8_PRG true) +def_cmd_target(lintpy ${FLAKE8_PRG} FLAKE8_PRG false) if(FLAKE8_PRG) add_custom_command(OUTPUT lintpy-cmd APPEND COMMAND ${FLAKE8_PRG} contrib/ scripts/ src/ test/) endif() -def_cmd_target(lintsh ${SHELLCHECK_PRG} SHELLCHECK_PRG true) +def_cmd_target(lintsh ${SHELLCHECK_PRG} SHELLCHECK_PRG false) if(SHELLCHECK_PRG) add_custom_command(OUTPUT lintsh-cmd APPEND COMMAND ${SHELLCHECK_PRG} scripts/vim-patch.sh) endif() diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 2f2ce35175..0d0fba265b 100755 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -803,7 +803,7 @@ foreach(sfile ${LINT_NVIM_SOURCES}) endforeach() add_custom_target(lintc DEPENDS ${LINT_TARGETS}) -def_cmd_target(lintuncrustify ${UNCRUSTIFY_PRG} UNCRUSTIFY_PRG false) # Non-fatal so that "lintc" target can depend on it. +def_cmd_target(lintuncrustify ${UNCRUSTIFY_PRG} UNCRUSTIFY_PRG false) if(UNCRUSTIFY_PRG) add_custom_command(OUTPUT lintuncrustify-cmd APPEND COMMAND ${CMAKE_COMMAND}