mirror of
https://github.com/neovim/neovim.git
synced 2024-12-19 18:55:14 -07:00
ci: Also lint lua code in src/nvim/lua
This commit is contained in:
parent
5b84c21182
commit
58f6ef50a8
@ -605,9 +605,26 @@ if(LUACHECK_PRG)
|
|||||||
add_custom_target(testlint
|
add_custom_target(testlint
|
||||||
COMMAND ${CMAKE_COMMAND}
|
COMMAND ${CMAKE_COMMAND}
|
||||||
-DLUACHECK_PRG=${LUACHECK_PRG}
|
-DLUACHECK_PRG=${LUACHECK_PRG}
|
||||||
-DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
|
-DLUAFILES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
|
||||||
|
-DIGNORE_PATTERN="*/preload.lua"
|
||||||
-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
|
-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
|
||||||
-P ${PROJECT_SOURCE_DIR}/cmake/RunTestsLint.cmake)
|
-P ${PROJECT_SOURCE_DIR}/cmake/RunLuacheck.cmake)
|
||||||
|
|
||||||
|
add_custom_target(
|
||||||
|
blobcodelint
|
||||||
|
COMMAND
|
||||||
|
${CMAKE_COMMAND}
|
||||||
|
-DLUACHECK_PRG=${LUACHECK_PRG}
|
||||||
|
-DLUAFILES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/src/nvim/lua
|
||||||
|
-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
|
||||||
|
-DREAD_GLOBALS=vim
|
||||||
|
-P ${PROJECT_SOURCE_DIR}/cmake/RunLuacheck.cmake
|
||||||
|
)
|
||||||
|
# TODO(ZyX-I): Run linter for all lua code in src
|
||||||
|
add_custom_target(
|
||||||
|
lualint
|
||||||
|
DEPENDS blobcodelint
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CPACK_PACKAGE_NAME "Neovim")
|
set(CPACK_PACKAGE_NAME "Neovim")
|
||||||
|
7
Makefile
7
Makefile
@ -107,6 +107,9 @@ functionaltest-lua: | nvim
|
|||||||
testlint: | build/.ran-cmake deps
|
testlint: | build/.ran-cmake deps
|
||||||
$(BUILD_CMD) -C build testlint
|
$(BUILD_CMD) -C build testlint
|
||||||
|
|
||||||
|
lualint: | build/.ran-cmake deps
|
||||||
|
$(BUILD_CMD) -C build lualint
|
||||||
|
|
||||||
unittest: | nvim
|
unittest: | nvim
|
||||||
+$(BUILD_CMD) -C build unittest
|
+$(BUILD_CMD) -C build unittest
|
||||||
|
|
||||||
@ -138,6 +141,6 @@ check-single-includes: build/.ran-cmake
|
|||||||
appimage:
|
appimage:
|
||||||
bash scripts/genappimage.sh
|
bash scripts/genappimage.sh
|
||||||
|
|
||||||
lint: check-single-includes clint testlint
|
lint: check-single-includes clint testlint lualint
|
||||||
|
|
||||||
.PHONY: test testlint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install appimage
|
.PHONY: test testlint lualint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install appimage
|
||||||
|
@ -20,6 +20,12 @@ run_test 'top_make testlint' testlint
|
|||||||
|
|
||||||
exit_suite --continue
|
exit_suite --continue
|
||||||
|
|
||||||
|
enter_suite 'lualint'
|
||||||
|
|
||||||
|
run_test 'top_make lualint' lualint
|
||||||
|
|
||||||
|
exit_suite --continue
|
||||||
|
|
||||||
enter_suite single-includes
|
enter_suite single-includes
|
||||||
|
|
||||||
CLICOLOR_FORCE=1 run_test_wd \
|
CLICOLOR_FORCE=1 run_test_wd \
|
||||||
|
@ -1,11 +1,20 @@
|
|||||||
set(IGNORE_FILES "${TEST_DIR}/*/preload.lua")
|
set(LUACHECK_ARGS -q "${LUAFILES_DIR}")
|
||||||
|
if(DEFINED IGNORE_PATTERN)
|
||||||
|
list(APPEND LUACHECK_ARGS --exclude-files "${LUAFILES_DIR}/${IGNORE_PATTERN}")
|
||||||
|
endif()
|
||||||
|
if(DEFINED CHECK_PATTERN)
|
||||||
|
list(APPEND LUACHECK_ARGS --include-files "${LUAFILES_DIR}/${CHECK_PATTERN}")
|
||||||
|
endif()
|
||||||
|
if(DEFINED READ_GLOBALS)
|
||||||
|
list(APPEND LUACHECK_ARGS --read-globals "${READ_GLOBALS}")
|
||||||
|
endif()
|
||||||
|
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND ${LUACHECK_PRG} -q ${TEST_DIR} --exclude-files ${IGNORE_FILES}
|
COMMAND "${LUACHECK_PRG}" ${LUACHECK_ARGS}
|
||||||
WORKING_DIRECTORY ${TEST_DIR}
|
WORKING_DIRECTORY "${LUAFILES_DIR}"
|
||||||
ERROR_VARIABLE err
|
ERROR_VARIABLE err
|
||||||
RESULT_VARIABLE res
|
RESULT_VARIABLE res
|
||||||
${EXTRA_ARGS})
|
)
|
||||||
|
|
||||||
if(NOT res EQUAL 0)
|
if(NOT res EQUAL 0)
|
||||||
message(STATUS "Output to stderr:\n${err}")
|
message(STATUS "Output to stderr:\n${err}")
|
||||||
|
Loading…
Reference in New Issue
Block a user