diff options
| -rw-r--r-- | .github/workflows/cbfmt.yml | 33 | ||||
| -rw-r--r-- | .github/workflows/selene.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/tests.yml | 1 | ||||
| -rw-r--r-- | tests/helpers/lua/dummy-registry/dummy2_package.lua | 9 | ||||
| -rw-r--r-- | tests/helpers/lua/dummy-registry/dummy_package.lua | 9 | ||||
| -rw-r--r-- | tests/helpers/lua/dummy-registry/fail_dummy.lua | 9 | ||||
| -rw-r--r-- | tests/minimal_init.vim | 2 |
7 files changed, 13 insertions, 52 deletions
diff --git a/.github/workflows/cbfmt.yml b/.github/workflows/cbfmt.yml deleted file mode 100644 index e59deba..0000000 --- a/.github/workflows/cbfmt.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: cbfmt check - -on: - push: - branches: - - "main" - pull_request: - -jobs: - cbfmt: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Download cbfmt - run: | - mkdir /tmp/cbfmt && cd $_ - curl -fsSL -o cbfmt.tar.gz "https://github.com/lukas-reineke/cbfmt/releases/download/v0.2.0/cbfmt_linux-x86_64_v0.2.0.tar.gz" - tar --strip-components 1 -xvf cbfmt.tar.gz - mv cbfmt /usr/local/bin/ - - name: Download Stylua - run: | - mkdir /tmp/stylua && cd $_ - curl -fsSL -o stylua.zip "https://github.com/JohnnyMorganz/StyLua/releases/download/v0.18.0/stylua-linux.zip" - unzip -d /usr/local/bin stylua.zip - - name: Download Shellharden - run: | - mkdir /tmp/shellharden && cd $_ - curl -fsSL -o shellharden.tar.gz https://github.com/alsuren/cargo-quickinstall/releases/download/shellharden-4.2.0-x86_64-unknown-linux-gnu/shellharden-4.2.0-x86_64-unknown-linux-gnu.tar.gz - tar -xvf shellharden.tar.gz - mv shellharden /usr/local/bin/ - - name: Run cbfmt check - # Lua examples in README.md doesn't conform to Stylua rules, on purpose. - run: find . -name '*.md' -not -path './dependencies/*' -not -path './README.md' | xargs cbfmt --check diff --git a/.github/workflows/selene.yml b/.github/workflows/selene.yml index 1486c9c..fb87d50 100644 --- a/.github/workflows/selene.yml +++ b/.github/workflows/selene.yml @@ -16,5 +16,5 @@ jobs: with: # token is needed because the action allegedly downloads binary from github releases token: ${{ secrets.GITHUB_TOKEN }} - args: lua/ tests/ scripts/ + args: lua/ tests/ version: 0.25.0 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2936692..44af09c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,6 +15,7 @@ jobs: matrix: nvim_version: - v0.11.0 + - v0.11.1 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/tests/helpers/lua/dummy-registry/dummy2_package.lua b/tests/helpers/lua/dummy-registry/dummy2_package.lua index 8ddee8d..ccd30c8 100644 --- a/tests/helpers/lua/dummy-registry/dummy2_package.lua +++ b/tests/helpers/lua/dummy-registry/dummy2_package.lua @@ -1,12 +1,9 @@ -local Pkg = require "mason-core.package" - -return Pkg:new { - schema = "registry+v1", +return { name = "dummy2", description = [[This is a dummy2 package.]], licenses = {}, - categories = { Pkg.Cat.LSP }, - languages = { Pkg.Lang.Dummy2Lang }, + categories = { "LSP" }, + languages = { "Dummy2Lang" }, homepage = "https://example.com", source = { id = "pkg:mason/dummy2@1.0.0", diff --git a/tests/helpers/lua/dummy-registry/dummy_package.lua b/tests/helpers/lua/dummy-registry/dummy_package.lua index bab0254..4a26c19 100644 --- a/tests/helpers/lua/dummy-registry/dummy_package.lua +++ b/tests/helpers/lua/dummy-registry/dummy_package.lua @@ -1,12 +1,9 @@ -local Pkg = require "mason-core.package" - -return Pkg:new { - schema = "registry+v1", +return { name = "dummy", description = [[This is a dummy package.]], licenses = {}, - categories = { Pkg.Cat.LSP }, - languages = { Pkg.Lang.DummyLang }, + categories = { "LSP" }, + languages = { "DummyLang" }, homepage = "https://example.com", source = { id = "pkg:mason/dummy@1.0.0", diff --git a/tests/helpers/lua/dummy-registry/fail_dummy.lua b/tests/helpers/lua/dummy-registry/fail_dummy.lua index 43ed559..0e68a45 100644 --- a/tests/helpers/lua/dummy-registry/fail_dummy.lua +++ b/tests/helpers/lua/dummy-registry/fail_dummy.lua @@ -1,12 +1,9 @@ -local Pkg = require "mason-core.package" - -return Pkg:new { - schema = "registry+v1", +return { name = "fail_dummy", description = [[This is a dummy package that fails.]], licenses = {}, - categories = { Pkg.Cat.LSP }, - languages = { Pkg.Lang.DummyLang }, + categories = { "LSP" }, + languages = { "DummyLang" }, homepage = "https://example.com", source = { id = "pkg:mason/fail_dummy@1.0.0", diff --git a/tests/minimal_init.vim b/tests/minimal_init.vim index e81ed89..80129dd 100644 --- a/tests/minimal_init.vim +++ b/tests/minimal_init.vim @@ -33,6 +33,8 @@ require("mason").setup { "lua:dummy-registry.index" } } + +require("mason-registry").refresh() EOF function! RunTests() abort |