From 2a76df1e21904700132681073fbc6c1acad4537f Mon Sep 17 00:00:00 2001 From: dutchie031 Date: Wed, 9 Sep 2026 15:36:02 +0200 Subject: [PATCH] updated --- .gitea/workflows/pr.yml | 27 +++++++++++++++++---------- .luacheckrc | 23 ----------------------- 2 files changed, 17 insertions(+), 33 deletions(-) delete mode 100644 .luacheckrc diff --git a/.gitea/workflows/pr.yml b/.gitea/workflows/pr.yml index c3243f2..6472901 100644 --- a/.gitea/workflows/pr.yml +++ b/.gitea/workflows/pr.yml @@ -6,6 +6,10 @@ on: - main - develop +env: + LUA_VERSION: "5.1" + LUA_LANGUAGE_SERVER_VERSION: ".19.1" + jobs: bundles_without_error: runs-on: ubuntu-latest @@ -17,7 +21,7 @@ jobs: - name: Set up Lua uses: leafo/gh-actions-lua@v13 with: - luaVersion: "5.1" + luaVersion: ${{ env.LUA_VERSION }} - name: Compile Spearhead uses: https://git.dutchie031.com/dutchie031/DcsMissionScriptingTools/github-action@action/v0 @@ -47,16 +51,19 @@ jobs: - name: Set up Lua uses: leafo/gh-actions-lua@v13 with: - luaVersion: "5.1" + luaVersion: ${{ env.LUA_VERSION }} - - name: Set up Luarocks - uses: leafo/gh-actions-luarocks@v4 + - name: Install lua-language-server + run: | + # For Ubuntu/Debian + wget https://github.com/LuaLS/lua-language-server/releases/download/${{ env.LUA_LANGUAGE_SERVER_VERSION }}/lua-language-server-${{ env.LUA_LANGUAGE_SERVER_VERSION }}-linux-x64.tar.gz + tar -xzf lua-language-server-*.tar.gz + rm lua-language-server-*.tar.gz - - name: Install luacheck - run: luarocks install luacheck + - name: Verify Lua Language Server Installation + run: ./lua-language-server-*/lua-language-server --version - # - name: Run Lua Check - # run: luacheck ./src --config .luacheckrc + - name: Run Lua Language Server + run: ./lua-language-server-*/lua-language-server --check ./src --checklevel=Information - - name: Check Types - uses: mrcjkb/lua-typecheck-action@08d5ead5db7b1c8457aa7a0e566240b680b34588 \ No newline at end of file + diff --git a/.luacheckrc b/.luacheckrc deleted file mode 100644 index edea3fb..0000000 --- a/.luacheckrc +++ /dev/null @@ -1,23 +0,0 @@ -std = "lua51" - -max_line_length = false - --- Cross-file globals set by Spearhead itself (no `require`/module system in the bundle) -globals = { - "SpearheadConfig", - "GlobalCapCallBacks", - "SpearheadAPI", -} - --- Reference: https://luacheck.readthedocs.io/en/stable/warnings.html -ignore = { - "614", -- Trailing whitespace in a comment -} - --- DCS Mission Scripting Environment API -read_globals = { - "env", "timer", "trigger", "world", "coalition", "country", - "AI", "Group", "Unit", "StaticObject", "SceneryObject", - "Airbase", "Weapon", "land", "atmosphere", "missionCommands", - "net", "lfs", "Object", "coord", "Controller" -}