From 23583f07bd617c1c30fd6803b8a40e84fc4baecc Mon Sep 17 00:00:00 2001 From: Gajo Petrovic Date: Wed, 8 Dec 2021 21:16:50 +0900 Subject: [PATCH 1/8] add luacheck github action --- .github/workflows/luacheck.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/luacheck.yml diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml new file mode 100644 index 00000000..9dafd422 --- /dev/null +++ b/.github/workflows/luacheck.yml @@ -0,0 +1,22 @@ +name: Luacheck + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Install luacheck + run: | + pip install hererocks + hererocks env --"lua 5.1" -rlatest + source env/bin/activate + luarocks install luacheck + + - name: Run luacheck + run: | + luacheck scen_edit triggers libs_sb/utils libs_sb/savetable.lua --enable 1 + From 65a3528b111a52579ea37210b7adbd89cff78e10 Mon Sep 17 00:00:00 2001 From: Gajo Petrovic Date: Wed, 8 Dec 2021 21:19:36 +0900 Subject: [PATCH 2/8] try again --- .github/workflows/luacheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml index 9dafd422..15cdb965 100644 --- a/.github/workflows/luacheck.yml +++ b/.github/workflows/luacheck.yml @@ -12,7 +12,7 @@ jobs: - name: Install luacheck run: | pip install hererocks - hererocks env --"lua 5.1" -rlatest + hererocks env --'lua 5.1' -rlatest source env/bin/activate luarocks install luacheck From ee324426dfeca82a1909e789523a292f8a5db919 Mon Sep 17 00:00:00 2001 From: Gajo Petrovic Date: Wed, 8 Dec 2021 21:22:38 +0900 Subject: [PATCH 3/8] try again --- .github/workflows/luacheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml index 15cdb965..63579758 100644 --- a/.github/workflows/luacheck.yml +++ b/.github/workflows/luacheck.yml @@ -12,7 +12,7 @@ jobs: - name: Install luacheck run: | pip install hererocks - hererocks env --'lua 5.1' -rlatest + hererocks env --lua 5.1 -rlatest source env/bin/activate luarocks install luacheck From 6b3c17a79ec17bfe6dbe7cf2f4e393602396a4ae Mon Sep 17 00:00:00 2001 From: Gajo Petrovic Date: Wed, 8 Dec 2021 21:23:47 +0900 Subject: [PATCH 4/8] try again --- .github/workflows/luacheck.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml index 63579758..745ca493 100644 --- a/.github/workflows/luacheck.yml +++ b/.github/workflows/luacheck.yml @@ -18,5 +18,6 @@ jobs: - name: Run luacheck run: | + source env/bin/activate luacheck scen_edit triggers libs_sb/utils libs_sb/savetable.lua --enable 1 From 6b8b5d7d6765eb5b88517ed1b1069ddd46af15e9 Mon Sep 17 00:00:00 2001 From: Gajo Petrovic Date: Wed, 8 Dec 2021 21:32:34 +0900 Subject: [PATCH 5/8] fix ci --- scen_edit/view/map/water_editor.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scen_edit/view/map/water_editor.lua b/scen_edit/view/map/water_editor.lua index a392457e..b68129d8 100644 --- a/scen_edit/view/map/water_editor.lua +++ b/scen_edit/view/map/water_editor.lua @@ -78,7 +78,7 @@ function WaterEditor:init() }), ColorField({ name = "diffuseColor", - title = "Diffuse Color:", + title = "Diffuse Color:", tooltip = "The color of the diffuse lighting of the water", width = 140, format = 'rgb', From d7b5d6d2690f74dd6f241af8c23bb90e096fca9c Mon Sep 17 00:00:00 2001 From: Gajo Petrovic Date: Wed, 8 Dec 2021 21:42:23 +0900 Subject: [PATCH 6/8] checkout submodules --- .github/workflows/luacheck.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml index 745ca493..e03821c5 100644 --- a/.github/workflows/luacheck.yml +++ b/.github/workflows/luacheck.yml @@ -8,6 +8,9 @@ jobs: steps: - uses: actions/checkout@v2 + with: + submodules: 'true' + - name: Install luacheck run: | From 654e7925d01a66e14d1e5ed67741c8d0538a387c Mon Sep 17 00:00:00 2001 From: Gajo Petrovic Date: Wed, 8 Dec 2021 21:49:44 +0900 Subject: [PATCH 7/8] bump launcher --- dist_cfg/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/dist_cfg/config.json b/dist_cfg/config.json index cf6f5334..32f7e2ab 100644 --- a/dist_cfg/config.json +++ b/dist_cfg/config.json @@ -181,4 +181,5 @@ } ] + } From db8c6824e6c53cb6379059c0228aa418e15faf21 Mon Sep 17 00:00:00 2001 From: Gajo Petrovic Date: Wed, 8 Dec 2021 21:51:12 +0900 Subject: [PATCH 8/8] remove travis --- .travis.yml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d9c229a7..00000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -language: python # Can use any language here, but if it's not 'python' - # it becomes necessary to pass '--user' to pip when installing hererocks. -sudo: false # Use container-based infrastructure. - -env: - - LUA="lua 5.1" - -before_install: - - pip install hererocks - - hererocks env --$LUA -rlatest # Use latest LuaRocks, install into 'env' directory. - - source env/bin/activate # Add directory with all installed binaries to PATH. - - luarocks install luacheck - -#install: -# - luarocks make # Install the rock, assuming there is a rockspec -# # in the root of the repository. - -script: - # '--enable 1' means 'global = true' - # IDEs tend to have issues with 'global = true', as they work on a per-file basis - # this allows us to use the same .luacheckrc for both travis and IDEs - - luacheck scen_edit triggers libs_sb/utils libs_sb/savetable.lua --enable 1 \ No newline at end of file