fix(ci): update for latest changes on HEAD

This commit is contained in:
Lewis Russell 2023-02-13 09:49:00 +00:00 committed by Lewis Russell
parent f29f0b22fd
commit d949a7a58c
2 changed files with 16 additions and 10 deletions

View File

@ -18,7 +18,7 @@ jobs:
strategy: strategy:
fail-fast: true fail-fast: true
matrix: matrix:
neovim_branch: ['v0.7.2', 'v0.8.0', 'nightly'] neovim_branch: ['v0.7.2', 'v0.8.3', 'nightly']
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
NEOVIM_BRANCH: ${{ matrix.neovim_branch }} NEOVIM_BRANCH: ${{ matrix.neovim_branch }}

View File

@ -8,6 +8,7 @@ TL_VERSION := 0.14.1
NEOVIM_BRANCH ?= master NEOVIM_BRANCH ?= master
DEPS_DIR := $(PWD)/deps/nvim-$(NEOVIM_BRANCH) DEPS_DIR := $(PWD)/deps/nvim-$(NEOVIM_BRANCH)
NVIM_DIR := $(DEPS_DIR)/neovim
LUAROCKS := luarocks --lua-version=$(LUA_VERSION) LUAROCKS := luarocks --lua-version=$(LUA_VERSION)
LUAROCKS_TREE := $(DEPS_DIR)/luarocks/usr LUAROCKS_TREE := $(DEPS_DIR)/luarocks/usr
@ -16,7 +17,7 @@ LUAROCKS_INIT := eval $$($(LUAROCKS) --tree $(LUAROCKS_TREE) path) &&
.DEFAULT_GOAL := build .DEFAULT_GOAL := build
$(DEPS_DIR)/neovim: $(NVIM_DIR):
@mkdir -p $(DEPS_DIR) @mkdir -p $(DEPS_DIR)
git clone --depth 1 https://github.com/neovim/neovim --branch $(NEOVIM_BRANCH) $@ git clone --depth 1 https://github.com/neovim/neovim --branch $(NEOVIM_BRANCH) $@
@# disable LTO to reduce compile time @# disable LTO to reduce compile time
@ -41,21 +42,26 @@ $(INSPECT):
lua_deps: $(TL) $(INSPECT) lua_deps: $(TL) $(INSPECT)
.PHONY: test_deps .PHONY: test_deps
test_deps: $(DEPS_DIR)/neovim test_deps: $(NVIM_DIR)
export VIMRUNTIME=$(DEPS_DIR)/neovim/runtime export VIMRUNTIME=$(NVIM_DIR)/runtime
export TEST_COLORS=1 export TEST_COLORS=1
ifneq ($(filter $(NEOVIM_BRANCH), master nightly),)
BUSTED = $(NVIM_DIR)/build/bin/nvim -ll $(NVIM_DIR)/test/busted_runner.lua
else
BUSTED = $(LUAROCKS_INIT) busted
endif
.PHONY: test .PHONY: test
test: $(DEPS_DIR)/neovim test: $(NVIM_DIR)
$(LUAROCKS_INIT) busted \ $(BUSTED) -v \
-v \
--lazy \ --lazy \
--helper=$(PWD)/test/preload.lua \ --helper=$(PWD)/test/preload.lua \
--output test.busted.outputHandlers.nvim \ --output test.busted.outputHandlers.nvim \
--lpath=$(DEPS_DIR)/neovim/?.lua \ --lpath=$(NVIM_DIR)/?.lua \
--lpath=$(DEPS_DIR)/neovim/build/?.lua \ --lpath=$(NVIM_DIR)/build/?.lua \
--lpath=$(DEPS_DIR)/neovim/runtime/lua/?.lua \ --lpath=$(NVIM_DIR)/runtime/lua/?.lua \
--lpath=$(DEPS_DIR)/?.lua \ --lpath=$(DEPS_DIR)/?.lua \
--lpath=$(PWD)/lua/?.lua \ --lpath=$(PWD)/lua/?.lua \
--filter="$(FILTER)" \ --filter="$(FILTER)" \