diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9ce80136..8279196b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,41 +10,24 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v2 - - - name: Setup luacheck - run: | - sudo apt update - sudo apt install -y lua5.1 luarocks - sudo luarocks install luacheck - - - name: Setup selene - run: | - wget "https://github.com/Kampfkarren/selene/releases/download/$VERSION/selene-$VERSION-linux.zip" - echo "$SHA256_CHECKSUM selene-$VERSION-linux.zip" > "selene-$VERSION-linux.zip.checksum" - sha256sum --check "selene-$VERSION-linux.zip.checksum" - unzip "selene-$VERSION-linux.zip" - install -Dp selene "$HOME/.local/bin/selene" - - echo "::add-matcher::.github/workflows/problem_matchers/selene.json" - env: - VERSION: "0.15.0" - SHA256_CHECKSUM: "8ff9272170158fbd9c1af38206ecadc894dc456665dc9bd9f0d43a26e5e8f1af" - - - name: Add $HOME/.local/bin to $PATH - run: echo "$HOME/.local/bin" >> $GITHUB_PATH + uses: actions/checkout@v3 - name: Run luacheck - run: luacheck lua/* test/* + uses: lunarmodules/luacheck@v0 + with: + args: lua/* test/* - name: Run selene - run: selene --display-style=quiet . + uses: NTBBloodbath/selene-action@v1.0.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + args: --display-style=quiet . style-lint: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Lint with stylua uses: JohnnyMorganz/stylua-action@1.0.0 diff --git a/.stylua.toml b/.stylua.toml index e548311d..78c5507c 100644 --- a/.stylua.toml +++ b/.stylua.toml @@ -3,4 +3,4 @@ line_endings = "Unix" indent_type = "Spaces" indent_width = 2 quote_style = "AutoPreferSingle" -no_call_parentheses = true +call_parentheses = "None" diff --git a/neovim.toml b/neovim.toml deleted file mode 100644 index 26ba9220..00000000 --- a/neovim.toml +++ /dev/null @@ -1,31 +0,0 @@ -[selene] -base = "lua51" -name = "neovim" - -[vim] -any = true - -[[assert.args]] -type = "bool" - -[[assert.args]] -type = "string" -required = false - -[[after_each.args]] -type = "function" - -[[before_each.args]] -type = "function" - -[[describe.args]] -type = "string" - -[[describe.args]] -type = "function" - -[[it.args]] -type = "string" - -[[it.args]] -type = "function" diff --git a/neovim.yml b/neovim.yml new file mode 100644 index 00000000..9de2931e --- /dev/null +++ b/neovim.yml @@ -0,0 +1,25 @@ +--- +base: lua51 + +globals: + vim: + any: true + assert: + args: + - type: bool + - type: string + required: false + after_each: + args: + - type: function + before_each: + args: + - type: function + describe: + args: + - type: string + - type: function + it: + args: + - type: string + - type: function