diff options
| author | Andrey Orst <andreyorst@gmail.com> | 2020-10-29 19:10:36 +0000 |
|---|---|---|
| committer | Andrey Orst <andreyorst@gmail.com> | 2020-10-29 19:10:36 +0000 |
| commit | 1a894f99fca1f9af0c51848bc6b1c580b8571cad (patch) | |
| tree | 1bb6c6a10c380a36bb2a156eb6aa5b08c1c027b3 | |
| parent | c1db15d8d29ee900725d235016365f68d9d29721 (diff) | |
| parent | 088d53723ac71967a9b8a1184329903753bc7ce0 (diff) | |
Merge branch 'ci-lua5.4' into 'master'
CI: lua5.4
See merge request andreyorst/fennel-cljlib!1
| -rw-r--r-- | .gitlab-ci.yml | 25 | ||||
| -rw-r--r-- | Makefile | 10 |
2 files changed, 20 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb54677..3443dc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,21 +1,24 @@ +--- + stages: - - test5.3 - - test5.4 + - test -test5.3: +test:Lua5.3: image: alpine:3.12.1 - stage: test5.3 + stage: test before_script: - apk add lua5.3 luarocks5.3 make - luarocks-5.3 install fennel script: - - make test + - LUA=lua5.3 make test -test5.4: - image: alpine:3.12.1 - stage: test5.4 +test:Lua5.4: + image: ubuntu:20.10 + stage: test before_script: - - apk add lua5.4 luarocks5.4 make - - luarocks-5.4 install fennel + - ln -snf /usr/share/zoneinfo/Europe/Moscow /etc/localtime + - echo Europe/Moscow > /etc/timezone + - apt-get update && apt-get install -y lua5.4 luarocks make >/dev/null + - luarocks install fennel script: - - make test + - LUA=lua5.4 make test @@ -1,3 +1,5 @@ +LUA ?= lua + FNLSOURCES = core.fnl core_test.fnl macros_test.fnl LUASOURCES = $(FNLSOURCES:.fnl=.lua) @@ -8,14 +10,14 @@ all: $(LUASOURCES) ${LUASOURCES}: $(FNLSOURCES) %.lua: %.fnl - fennel --compile $< > $@ + fennel --lua $(LUA) --compile $< > $@ clean: rm -f *.lua luacov* test: - @fennel core_test.fnl - @fennel macros_test.fnl + @fennel --lua $(LUA) core_test.fnl + @fennel --lua $(LUA) macros_test.fnl luacov: | clean all luacov-stats luacov @@ -28,7 +30,7 @@ luacov-console: | luacov @mv macros_test.lua.tmp macros_test.lua luacov-stats: core_test.lua macros_test.lua - @lua -lluarocks.loader -lluacov $< + @$(LUA) -lluarocks.loader -lluacov $< help: @echo "make -- run tests and create lua library" >&2 |