diff --git a/.github/workflows/lua_linter.yaml b/.github/workflows/lua_linter.yaml index 6639a5f2..d849e9d9 100644 --- a/.github/workflows/lua_linter.yaml +++ b/.github/workflows/lua_linter.yaml @@ -7,17 +7,4 @@ on: jobs: lua-lint: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: GLua Linter - uses: TASSIA710/action-glua-lint@v1.1.4 - with: - lint_maxScopeDepth: 0 - lint_deprecated: false - lint_emptyBlocks: false - lint_unusedParameters: false - lint_unusedLoopVars: false - lint_shadowing: false \ No newline at end of file + uses: FPtje/GLuaFixer/.github/workflows/glualint.yml@master \ No newline at end of file diff --git a/.github/workflows/update_workshop.yaml b/.github/workflows/update_workshop.yaml index 07ebdb87..86bd29e1 100644 --- a/.github/workflows/update_workshop.yaml +++ b/.github/workflows/update_workshop.yaml @@ -13,7 +13,7 @@ jobs: update-workshop: if: github.repository == 'CapsAdmin/pac3' - needs: linter + # needs: linter runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.glualint.json b/.glualint.json new file mode 100644 index 00000000..9e1ebaff --- /dev/null +++ b/.glualint.json @@ -0,0 +1,8 @@ +{ + "lint_maxScopeDepth": 0, + "lint_shadowing": false, + "lint_spaceAfterComma": true, + "lint_ignoreFiles": [ + "lua/entities/gmod_wire_expression2/*" + ] +} \ No newline at end of file diff --git a/addon.json b/addon.json index 66d8922e..6700ee30 100644 --- a/addon.json +++ b/addon.json @@ -4,18 +4,19 @@ "tags" : [ "fun", "roleplay" ], "ignore" : [ - ".gitignore", ".editorconfig", ".git*", + ".gitignore", + ".glualint.json", ".vscode/*", - "*.txt", - "*.md", - "*.bat", - "*.sh", - "icon.jpg", "*.7z", + "*.bat", "*.md", + "*.md", + "*.sh", + "*.txt", "*.yml", - "COPYING" + "COPYING", + "icon.jpg" ] } diff --git a/addon_develop.json b/addon_develop.json index 82100f16..5c6ab422 100644 --- a/addon_develop.json +++ b/addon_develop.json @@ -4,18 +4,19 @@ "tags" : [ "fun", "roleplay" ], "ignore" : [ - ".gitignore", ".editorconfig", ".git*", + ".gitignore", + ".glualint.json", ".vscode/*", - "*.txt", - "*.md", - "*.bat", - "*.sh", - "icon.jpg", "*.7z", + "*.bat", "*.md", + "*.md", + "*.sh", + "*.txt", "*.yml", - "COPYING" + "COPYING", + "icon.jpg" ] }