diff --git a/.github/problem-matchers/Lua.json b/.github/problem-matchers/Lua.json index c62c44f18de..6983ecf8178 100644 --- a/.github/problem-matchers/Lua.json +++ b/.github/problem-matchers/Lua.json @@ -15,16 +15,14 @@ }, { "owner": "Lua-language-server-problem-matcher", + "fileLocation": [ "relative", "${GITHUB_WORKSPACE}" ], "pattern": [ { - "regexp": "^(.+.lua):(\\d+):(\\d+)", + "regexp": "^(.+\\.lua):(\\d+):(\\d+)(.*)$", "file": 1, "line": 2, - "column": 3 - }, - { - "regexp": "^(.*)", - "message": 1 + "column": 3, + "message": 4 } ] } diff --git a/.github/workflows/test_scripting.yml b/.github/workflows/test_scripting.yml index 7ca4df581d1..0b81791f5fe 100644 --- a/.github/workflows/test_scripting.yml +++ b/.github/workflows/test_scripting.yml @@ -29,8 +29,10 @@ jobs: with: submodules: 'recursive' - - name: Register lua problem matcher - run: echo "::add-matcher::.github/problem-matchers/Lua.json" + - name: Register lua check problem matcher + run: | + echo "::add-matcher::.github/problem-matchers/Lua.json" + echo "::remove-matcher owner=Lua-language-server-problem-matcher::" - name: Lua Linter shell: bash @@ -39,12 +41,22 @@ jobs: sudo apt-get -y install lua-check ./Tools/scripts/run_luacheck.sh + - name: Register lua language server problem matcher + run: | + echo "::add-matcher::.github/problem-matchers/Lua.json" + echo "::remove-matcher owner=Luacheck-problem-matcher::" + - name: Language server check shell: bash run: | python3 -m pip install github-release-downloader python3 ./Tools/scripts/run_lua_language_check.py + - name: Remove problem matchers + run: | + echo "::remove-matcher owner=Luacheck-problem-matcher::" + echo "::remove-matcher owner=Lua-language-server-problem-matcher::" + - name: Generate docs md shell: bash run: |