diff --git a/.github/workflows/check-lua.yaml b/.github/workflows/check-lua.yaml index b1fcde3..a027e72 100644 --- a/.github/workflows/check-lua.yaml +++ b/.github/workflows/check-lua.yaml @@ -25,7 +25,8 @@ jobs: - name: Prepare run: | sudo apt-get update - sudo apt-get install -y rustc - sudo cargo install stylua + sudo apt install -y nodejs npm - name: Lint - run: make lint_stylua + run: "make lint_stylua" + env: + STULUA: "npx @johnnymorganz/stylua-bin" diff --git a/Makefile b/Makefile index 9ee4bbf..9f43c00 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,14 @@ all: format lint test +STYLUA ?= stylua + .PHONY: test test: nvim --headless -u scripts/minimal_init.lua -c "PlenaryBustedDirectory lua { minimal_init='./scripts/minimal_init.lua', sequential=true, }" .PHONY: lint_stylua lint_stylua: - stylua --color always --check lua + ${STYLUA} --color always --check lua .PHONY: lint_luacheck lint_luacheck: @@ -17,5 +19,5 @@ lint: lint_luacheck lint_stylua .PHONY: format format: - stylua lua + ${STYLUA} lua