From 488f949a977e1cb9baa8069e349be69d0b1cf5de Mon Sep 17 00:00:00 2001 From: flux <25628292+fluxionary@users.noreply.github.com> Date: Fri, 22 Jul 2022 11:35:01 -0700 Subject: [PATCH] re-enable pre-commit checks (was disabled unknowingly) --- .github/workflows/build.yml | 11 +++++++++-- luacheck.sh | 1 - stairsplus/aliases.lua | 2 -- stairsplus/compat/i3.lua | 2 -- stairsplus/compat/init.lua | 1 - stairsplus/compat/unified_inventory.lua | 2 -- stairsplus/locale/cleanup_tr.py | 1 - stairsplus_legacy/gloopblocks.lua | 1 - 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b84ab1..c0ffd5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ name: build -on: [ push, pull_request ] +on: [push, pull_request] jobs: build: @@ -7,9 +7,16 @@ jobs: steps: - uses: actions/checkout@master + - uses: actions/setup-python@master + + - name: Install pre-commit + run: pip3 install pre-commit + + - name: Run pre-commit + run: pre-commit run --all-files - name: install luarocks - run: sudo apt-get install -y luarocks + run: sudo apt-get install -qq luarocks - name: install luacheck via luarocks run: luarocks install --local luacheck diff --git a/luacheck.sh b/luacheck.sh index 6475cbe..fefd3b9 100644 --- a/luacheck.sh +++ b/luacheck.sh @@ -4,4 +4,3 @@ luacheck --config ./invsaw/.luacheckrc -q ./invsaw luacheck --config ./moreblocks/.luacheckrc -q ./moreblocks luacheck --config ./stairsplus/.luacheckrc -q ./stairsplus luacheck --config ./stairsplus_legacy/.luacheckrc -q ./stairsplus_legacy - diff --git a/stairsplus/aliases.lua b/stairsplus/aliases.lua index c4df643..e31f4da 100644 --- a/stairsplus/aliases.lua +++ b/stairsplus/aliases.lua @@ -1,4 +1,2 @@ minetest.register_alias("circular_saw", "stairsplus:circular_saw") minetest.register_alias("moreblocks:circular_saw", "stairsplus:circular_saw") - - diff --git a/stairsplus/compat/i3.lua b/stairsplus/compat/i3.lua index 0e6e601..0a107b7 100644 --- a/stairsplus/compat/i3.lua +++ b/stairsplus/compat/i3.lua @@ -99,5 +99,3 @@ for _, single in ipairs(api.registered_singles) do end api.register_on_register_single(on_register_single) - - diff --git a/stairsplus/compat/init.lua b/stairsplus/compat/init.lua index 2d55bc9..95e9b4f 100644 --- a/stairsplus/compat/init.lua +++ b/stairsplus/compat/init.lua @@ -22,4 +22,3 @@ stairsplus.dofile("compat", "unified_inventory") stairsplus.dofile("compat", "stairs") stairsplus.dofile("compat", "old_moreblocks") - diff --git a/stairsplus/compat/unified_inventory.lua b/stairsplus/compat/unified_inventory.lua index ed70330..79aa55e 100644 --- a/stairsplus/compat/unified_inventory.lua +++ b/stairsplus/compat/unified_inventory.lua @@ -130,5 +130,3 @@ for _, single in ipairs(api.registered_singles) do end api.register_on_register_single(on_register_single) - - diff --git a/stairsplus/locale/cleanup_tr.py b/stairsplus/locale/cleanup_tr.py index ff9151c..d6d6015 100644 --- a/stairsplus/locale/cleanup_tr.py +++ b/stairsplus/locale/cleanup_tr.py @@ -36,4 +36,3 @@ for tr in ourdir.glob('*.tr'): print(f'{key}={value}', file=fh) else: print(line, end='', file=fh) - diff --git a/stairsplus_legacy/gloopblocks.lua b/stairsplus_legacy/gloopblocks.lua index 2091dfa..da6b07a 100644 --- a/stairsplus_legacy/gloopblocks.lua +++ b/stairsplus_legacy/gloopblocks.lua @@ -5,4 +5,3 @@ if materials.cement_block and materials.cement_block ~= "gloopblocks:cement" the elseif minetest.registered_nodes["gloopblocks:cement"] then stairsplus_legacy.register_legacy("gloopblocks:cement") end -