Merge branch 'try-multi-value-return' into 'master'

Try multi value return

Closes #2

See merge request andreyorst/fennel-cljlib!10

1 files changed, 18 insertions, 39 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b4ed46..e16aeb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,39 +4,23 @@ stages:
     - test
     - coverage
 
-cache:
-    paths:
-        - .cache
-
 variables:
     GIT_SUBMODULE_STRATEGY: recursive
+    fennel_ver: 0.9.2
+    fenneldoc_ver: v0.1.6
 
 .install_fennel: &fennel |-
-    cd "$CI_PROJECT_DIR"
-    mkdir -p .cache
-    cd .cache
-    [ -d fennel ] || git clone -q https://git.sr.ht/~technomancy/fennel
+    cd "$HOME"
+    git clone -q --depth=1 --branch=0.9.2 https://git.sr.ht/~technomancy/fennel
     cd fennel || exit -1
-    git checkout -q .
-    git checkout -q main
-    git pull -q --rebase
-    git checkout 0.8.1
-    make clean
     make install
     cd "$CI_PROJECT_DIR"
 
 .install_fenneldoc: &fenneldoc |-
-    cd "$CI_PROJECT_DIR"
-    mkdir -p .cache
-    cd .cache
-    [ -d fenneldoc ] || git clone -q https://gitlab.com/andreyorst/fenneldoc.git
+    cd "$HOME"
+    git clone -q --depth=1 --branch="$fenneldoc_ver" \
+              --recursive https://gitlab.com/andreyorst/fenneldoc.git
     cd fenneldoc || exit -1
-    git checkout -q .
-    git checkout -q master
-    git pull -q --rebase
-    git checkout -q v0.1.5
-    git submodule update --init
-    make clean
     make install
     cd "$CI_PROJECT_DIR"
 
@@ -50,10 +34,19 @@ Lua:
             git make gcc musl-dev
         - luarocks-5.3 install luafilesystem
         - export LUA=lua5.3
-        - *fennel
+        - luarocks-5.3 install fennel "$fennel_ver"
+        - luarocks-5.3 install luacov
+        - luarocks-5.3 install luacov-cobertura
+        - luarocks-5.3 install luacov-console
         - *fenneldoc
     script:
-        - LUA_EXECUTABLES="lua5.2 lua5.3 lua5.4" make testall >/dev/null
+        - LUAEXECUTABLES="lua5.2 lua5.3 lua5.4" make testall >/dev/null
+        - make luacov-console  # doesn't use --correlate, more accurate
+        - make luacov          # produces Cobertura XML
+    artifacts:
+        reports:
+            cobertura: coverage/cobertura-coverage.xml
+    coverage: '/Total.*\s(\d+.\d+%)$/'
 
 # Luajit actually is an impostor in Alpine, as the package actually
 # uses Moonjit implementation, which is different from what I'm
@@ -67,17 +60,3 @@ Luajit:
         - *fennel
     script:
         - LUA=luajit make test
-
-# We install fennel via luarocks because I don't want to figure out
-# how to install luacov without luarocks
-Coverage:
-    image: alpine:3.12.1
-    stage: coverage
-    before_script:
-        - apk add -q lua5.3 lua5.3-dev luarocks5.3 make gcc musl-dev
-        - luarocks-5.3 install fennel
-        - luarocks-5.3 install luacov
-        - luarocks-5.3 install luacov-console
-    script:
-        - LUA=lua5.3 make luacov-console >/dev/null
-        - luacov-console --no-colored -s