diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 8a8ce1e..8cb84d4 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -23,9 +23,7 @@ jobs: with: module-name: checks version-pre-extraction-hook: | - local rock_utils = require('test.rock_utils') - rock_utils.remove_builtin('checks') - rock_utils.assert_nonbuiltin('checks') + require('test.rock_utils').assert_nonbuiltin('checks') package: # Skip pull request jobs when the source branch is in the same diff --git a/.github/workflows/push_rockspec.yml b/.github/workflows/push_rockspec.yml index 9936873..ae3e383 100644 --- a/.github/workflows/push_rockspec.yml +++ b/.github/workflows/push_rockspec.yml @@ -24,9 +24,7 @@ jobs: with: module-name: checks version-pre-extraction-hook: | - local rock_utils = require('test.rock_utils') - rock_utils.remove_builtin('checks') - rock_utils.assert_nonbuiltin('checks') + require('test.rock_utils').assert_nonbuiltin('checks') push-scm-rockspec: runs-on: [ ubuntu-20.04 ] diff --git a/CMakeLists.txt b/CMakeLists.txt index c3675a4..2025061 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,3 +18,13 @@ install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME} DESTINATION ${TARANTOOL_INSTALL_LUADIR} ) + +install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.lua + DESTINATION ${TARANTOOL_INSTALL_LUADIR}/override +) + +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME} + DESTINATION ${TARANTOOL_INSTALL_LUADIR}/override +) diff --git a/debian/tarantool-checks.install b/debian/tarantool-checks.install index c256f86..b7fd8eb 100644 --- a/debian/tarantool-checks.install +++ b/debian/tarantool-checks.install @@ -1,2 +1,4 @@ checks.lua usr/share/tarantool/ checks usr/share/tarantool/ +checks.lua usr/share/tarantool/override +checks usr/share/tarantool/override diff --git a/rpm/tarantool-checks.spec b/rpm/tarantool-checks.spec index 9ba8f54..3e9a632 100644 --- a/rpm/tarantool-checks.spec +++ b/rpm/tarantool-checks.spec @@ -22,10 +22,13 @@ Easy, terse, readable and fast function arguments type checking. mkdir -p %{br_luapkgdir} cp -av checks.lua %{br_luapkgdir} cp -rv checks %{br_luapkgdir} +cp -av checks.lua %{br_luapkgdir}/override +cp -rv checks %{br_luapkgdir}/override %files %{luapkgdir}/checks.lua %{luapkgdir}/checks +%{luapkgdir}/override %doc README.md %{!?_licensedir:%global license %doc} %license LICENSE