diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3edccdf7..6b28530d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - uses: leafo/gh-actions-lua@v10 + - uses: leafo/gh-actions-lua@v11 with: luaVersion: "5.1.5" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 60fe731e..5592c70e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -15,13 +15,13 @@ jobs: contents: write env: - NVIM_TS_SHA: master + NVIM_TS_SHA: main steps: - name: Checkout uses: actions/checkout@v4 - - uses: leafo/gh-actions-lua@v10 + - uses: leafo/gh-actions-lua@v11 with: luaVersion: "5.1.5" @@ -40,9 +40,7 @@ jobs: with: path: ./nvim-treesitter/parser/ key: parsers-${{ join(matrix.*, '-') }}-${{ hashFiles( - './nvim-treesitter/lockfile.json', - './nvim-treesitter/lua/nvim-treesitter/install.lua', - './nvim-treesitter/lua/nvim-treesitter/parsers.lua') }} + './deps/nvim-treesitter/lua/nvim-treesitter/parsers.lua') }} - name: Install parsers run: make parsers diff --git a/.luacheckrc b/.luacheckrc deleted file mode 100644 index 3a12a297..00000000 --- a/.luacheckrc +++ /dev/null @@ -1 +0,0 @@ -read_globals = {"vim"} diff --git a/Makefile b/Makefile index 65f75b90..41316d8c 100644 --- a/Makefile +++ b/Makefile @@ -54,9 +54,6 @@ parsers: $(NVIM_TEST) $(NVIM_TS) $(XDG_DATA_HOME)/nvim-test/nvim-runner-$(NVIM_RUNNER_VERSION)/bin/nvim \ -l test/helpers.lua install -lint: - luacheck lua - # ------------------------------------------------------------------------------ # LuaLS # ------------------------------------------------------------------------------ @@ -101,7 +98,7 @@ endif # Stylua # ------------------------------------------------------------------------------ -STYLUA_VERSION := v2.0.2 +STYLUA_VERSION := v2.1.0 STYLUA_ZIP := stylua-$(STYLUA_PLATFORM).zip STYLUA_URL := https://github.com/JohnnyMorganz/StyLua/releases/download/$(STYLUA_VERSION)/$(STYLUA_ZIP) STYLUA := deps/stylua @@ -129,4 +126,4 @@ stylua-check: $(STYLUA) .PHONY: stylua-run stylua-run: $(STYLUA) $(STYLUA) $(LUA_FILES) - sed -i -r 's/---@/--- @/g' $(LUA_FILES) + perl -pi -e 's/---@/--- @/g' $(LUA_FILES)