chore(ci): partition deps better

This commit is contained in:
Lewis Russell 2022-10-07 15:13:15 +01:00 committed by Lewis Russell
parent 666edc7ba4
commit 05fd787b79
2 changed files with 16 additions and 11 deletions

View File

@ -54,7 +54,7 @@ jobs:
uses: actions/cache@v2
with:
path: deps
key: build-6-${{ steps.get-nvim-sha.outputs.sha }}
key: build-1-${{ steps.get-nvim-sha.outputs.sha }}
- name: Install Lua Deps
run: make lua_deps
@ -82,7 +82,7 @@ jobs:
- name: Build Neovim
if: steps.cache-deps.outputs.cache-hit != 'true'
run: make deps/neovim NEOVIM_BRANCH=$NEOVIM_BRANCH
run: make test_deps NEOVIM_BRANCH=$NEOVIM_BRANCH
- name: Run Test
run: make test

View File

@ -7,15 +7,17 @@ LUA_VERSION := 5.1
TL_VERSION := 0.14.1
NEOVIM_BRANCH := master
DEPS_DIR := $(PWD)/deps/nvim-$(NEOVIM_BRANCH)
LUAROCKS := luarocks --lua-version=$(LUA_VERSION)
LUAROCKS_TREE := $(PWD)/deps/luarocks/usr
LUAROCKS_TREE := $(DEPS_DIR)/luarocks/usr
LUAROCKS_LPATH := $(LUAROCKS_TREE)/share/lua/$(LUA_VERSION)
LUAROCKS_INIT := eval $$($(LUAROCKS) --tree $(LUAROCKS_TREE) path) &&
.DEFAULT_GOAL := build
deps/neovim:
@mkdir -p deps
$(DEPS_DIR)/neovim:
@mkdir -p $(DEPS_DIR)
git clone --depth 1 https://github.com/neovim/neovim --branch $(NEOVIM_BRANCH) $@
@# disable LTO to reduce compile time
make -C $@ \
@ -38,20 +40,23 @@ $(INSPECT):
.PHONY: lua_deps
lua_deps: $(TL) $(INSPECT)
export VIMRUNTIME=$(PWD)/deps/neovim/runtime
.PHONY: test_deps
test_deps: $(DEPS_DIR)/neovim
export VIMRUNTIME=$(DEPS_DIR)/neovim/runtime
export TEST_COLORS=1
.PHONY: test
test: deps/neovim
test: $(DEPS_DIR)/neovim
$(LUAROCKS_INIT) busted \
-v \
--lazy \
--helper=$(PWD)/test/preload.lua \
--output test.busted.outputHandlers.nvim \
--lpath=$(PWD)/deps/neovim/?.lua \
--lpath=$(PWD)/deps/neovim/build/?.lua \
--lpath=$(PWD)/deps/neovim/runtime/lua/?.lua \
--lpath=$(PWD)/deps/?.lua \
--lpath=$(DEPS_DIR)/neovim/?.lua \
--lpath=$(DEPS_DIR)/neovim/build/?.lua \
--lpath=$(DEPS_DIR)/neovim/runtime/lua/?.lua \
--lpath=$(DEPS_DIR)/?.lua \
--lpath=$(PWD)/lua/?.lua \
--filter="$(FILTER)" \
$(PWD)/test