build: 👷🏻‍♀️ CI and GA pipeline enhancements #1

puria · Jan 28, 2022 · 69fdc52 · 69fdc52
2 parents d73f2e9 + 5de4350
commit 69fdc52
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/.github/workflows/busted.yml b/.github/workflows/busted.yml
@@ -24,6 +24,7 @@ jobs:
       run: |
         luarocks install busted
         luarocks install luacov-coveralls
+    - run: luarocks build
     - run: busted -c -v
     - name: Report test coverage
       if: success()

diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        lua-version: ["5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty"]
+        lua-version: ["5.4", "5.3", "5.2", "5.1", "luajit"]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

diff --git a/Makefile b/Makefile
@@ -1,10 +1,17 @@
+# SPDX-FileCopyrightText: 2022 2022 Puria Nafisi Azizi <puria@dyne.org>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
 
 .PHONY: test local build lint clean
 
 LUA_VERSION:=5.1
 LUA_TREE:=lua_modules
 MODULE:=lua-starter-template
 ROCKS:=luarocks --lua-version=${LUA_VERSION} --tree=${LUA_TREE}
+LUA_PATH:="$$(luarocks --lua-version=${LUA_VERSION} path --lr-path);;"
+LUA_CPATH="$$(luarocks --lua-version=${LUA_VERSION} path --lr-cpath);;"
+BIN:=${LUA_TREE}/bin
+
 
 local: build
 	${ROCKS} make --force --local ${MODULE}-dev-1.rockspec
@@ -13,21 +20,22 @@ deps:
 	${ROCKS} install busted
 	${ROCKS} install luacheck
 	${ROCKS} install luacov
+	python3 -m pip install --user pipx
 
 build:
 	${ROCKS} build
 	# ${ROCKS} make ${MODULE}-dev-1.rockspec
 
 test: luarocks build
-	LUA_PATH="$$(luarocks --lua-version=${LUA_VERSION} path --lr-path);;" LUA_CPATH="$$(luarocks --lua-version=${LUA_VERSION} path --lr-cpath);;" ${LUA_TREE}/bin/busted spec
+	LUA_PATH=${LUA_PATH} LUA_CPATH=${LUA_CPATH} ${BIN}/busted spec
 
 luarocks:
 	luarocks init --lua-versions=${LUA_VERSION}
 	eval $(luarocks --lua-version=${LUA_VERSION} path)
 
 lint:
 	pipx run reuse lint
-	luacheck .
+	LUA_PATH=${LUA_PATH} LUA_CPATH=${LUA_CPATH} ${BIN}/luacheck .
 
 clean:
 	rm -rf ${LUA_TREE} lua luarocks .luarocks luacov.stats.out
diff --git a/lua-starter-template-dev-1.rockspec b/lua-starter-template-dev-1.rockspec
@@ -1,3 +1,7 @@
+-- SPDX-FileCopyrightText: 2022 Puria Nafisi Azizi <puria@dyne.org>
+--
+-- SPDX-License-Identifier: AGPL-3.0-or-later
+
 package = "lua-starter-template"
 version = "dev-1"
 source = {

diff --git a/spec/test1_spec.lua b/spec/test1_spec.lua
@@ -1,3 +1,7 @@
+-- SPDX-FileCopyrightText: 2022 2022 Puria Nafisi Azizi <puria@dyne.org>
+--
+-- SPDX-License-Identifier: AGPL-3.0-or-later
+
 local m = require("starter")
 
 describe("Busted unit testing framework", function()