X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=.gitlab-ci.yml;h=b1e9653731eba7d43e0fbd9685d28055d4df6a9a;hp=45531263d9cdfcb3988661d9d6e31b5fa160a9a7;hb=f34df0b8a224d371420da98a55c47e33acec0288;hpb=d6cb6f0d8d258f4125fd3a0cc3899541ea2efd5b

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4553126..b1e9653 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,5 @@
 image: alpine
 
-variables:
-  GIT_SUBMODULE_STRATEGY: "recursive"
-  GIT_SSL_NO_VERIFY: "true"
-
 stages:
   - build
   - test
@@ -14,9 +10,9 @@ binary:debug:
   stage: build
   before_script:
     - apk update
-    - apk add make gcc musl-dev python3
-    - pip3 install PyYAML
-  script: 
+    - apk add make gcc musl-dev python py2-pip libedit-dev
+    - pip install PyYAML
+  script:
     - make debug
   artifacts:
     paths:
@@ -33,9 +29,9 @@ binary:release:
   stage: build
   before_script:
     - apk update
-    - apk add make gcc musl-dev python3
-    - pip3 install PyYAML
-  script: 
+    - apk add make gcc musl-dev python py2-pip libedit-dev
+    - pip install PyYAML
+  script:
     - make advent cheat
   artifacts:
     paths:
@@ -85,14 +81,14 @@ test:debug:
   stage: test
   before_script:
     - apk update
-    - apk add make gcc
+    - apk add make gcc python py2-pip libedit-dev
+    - pip install PyYAML
     - apk add lcov --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted
   script:
     - cd tests
     - make
+    - make coverage
     - cd ..
-    - lcov -t "advent" -o advent.info -c -d .
-    - genhtml -o coverage advent.info
   artifacts:
     paths:
       - coverage
@@ -103,7 +99,7 @@ test:release:
   stage: test
   before_script:
     - apk update
-    - apk add make
+    - apk add make libedit
   script:
     - cd tests
     - make
@@ -123,4 +119,3 @@ pages:
     - master
   dependencies:
     - test:debug
-