Skip to content

Commit

Permalink
fix(ci): update for latest changes on HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
lewis6991 committed Feb 13, 2023
1 parent f29f0b2 commit 477aad2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: true
matrix:
neovim_branch: ['v0.7.2', 'v0.8.0', 'nightly']
neovim_branch: ['v0.7.2', 'v0.8.3', 'nightly']
runs-on: ubuntu-latest
env:
NEOVIM_BRANCH: ${{ matrix.neovim_branch }}
Expand Down
24 changes: 15 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ TL_VERSION := 0.14.1
NEOVIM_BRANCH ?= master

DEPS_DIR := $(PWD)/deps/nvim-$(NEOVIM_BRANCH)
NVIM_DIR := $(DEPS_DIR)/neovim

LUAROCKS := luarocks --lua-version=$(LUA_VERSION)
LUAROCKS_TREE := $(DEPS_DIR)/luarocks/usr
Expand All @@ -16,7 +17,7 @@ LUAROCKS_INIT := eval $$($(LUAROCKS) --tree $(LUAROCKS_TREE) path) &&

.DEFAULT_GOAL := build

$(DEPS_DIR)/neovim:
$(NVIM_DIR):
@mkdir -p $(DEPS_DIR)
git clone --depth 1 https://github.com/neovim/neovim --branch $(NEOVIM_BRANCH) $@
@# disable LTO to reduce compile time
Expand All @@ -41,21 +42,26 @@ $(INSPECT):
lua_deps: $(TL) $(INSPECT)

.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

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
test: $(DEPS_DIR)/neovim
$(LUAROCKS_INIT) busted \
-v \
test: $(NVIM_DIR)
$(BUSTED) -v \
--lazy \
--helper=$(PWD)/test/preload.lua \
--output test.busted.outputHandlers.nvim \
--lpath=$(DEPS_DIR)/neovim/?.lua \
--lpath=$(DEPS_DIR)/neovim/build/?.lua \
--lpath=$(DEPS_DIR)/neovim/runtime/lua/?.lua \
--lpath=$(NVIM_DIR)/?.lua \
--lpath=$(NVIM_DIR)/build/?.lua \
--lpath=$(NVIM_DIR)/runtime/lua/?.lua \
--lpath=$(DEPS_DIR)/?.lua \
--lpath=$(PWD)/lua/?.lua \
--filter="$(FILTER)" \
Expand Down

0 comments on commit 477aad2

Please sign in to comment.