Another coverage tweak.

[open-adventure.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ec7641e63a85795a5de6383dfc6968059399b63..1a695406a6cf87bc13fee2706a320a3bbc9dd581 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,4 @@
-image: alpine
-
-variables:
-  GIT_SSL_CAPATH: "/etc/ssl/certs"
-  GIT_CURL_VERBOSE: "1"
+image: opensuse:tumbleweed
 
 stages:
   - build
@@ -13,40 +9,35 @@ stages:
 binary:debug:
   stage: build
   before_script:
-    - apk update
-    - apk add make gcc musl-dev
-  script: 
+    - zypper install -y make gcc libedit-devel libasan5 libubsan1 python python2-PyYAML lcov
+  script:
     - make debug
   artifacts:
     paths:
       - advent
-      - "*.gcda"
-      - "*.gcno"
-  # cache outputs to reduce the build time
-  cache:
-    paths:
+      - cheat
       - "*.o"
+      - dungeon.c
+      - dungeon.h
 
 binary:release:
   stage: build
   before_script:
-    - apk update
-    - apk add make gcc musl-dev
-  script: 
-    - make advent
+    - zypper install -y make gcc libedit-devel python python2-PyYAML
+  script:
+    - make advent cheat
   artifacts:
     paths:
       - advent
-  # cache outputs to reduce the build time
-  cache:
-    paths:
+      - cheat
       - "*.o"
+      - dungeon.c
+      - dungeon.h
 
 manpage:
   stage: build
   before_script:
-    - apk update
-    - apk add make asciidoc
+    - zypper install -y make asciidoc
   script:
     - make advent.6
   artifacts:
@@ -56,8 +47,7 @@ manpage:
 html:
   stage: build
   before_script:
-    - apk update
-    - apk add make asciidoc libxslt
+    - zypper install -y make asciidoc libxslt
   script:
     - make html
   artifacts:
@@ -67,8 +57,7 @@ html:
 dist:
   stage: build
   before_script:
-    - apk update
-    - apk add make asciidoc
+    - zypper install -y make asciidoc tar
   script:
     - export VERS=${CI_COMMIT_REF_NAME}
     - make dist -e
@@ -80,26 +69,26 @@ dist:
 test:debug:
   stage: test
   before_script:
-    - apk update
-    - apk add make gcc
-    - apk add lcov --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted
+    - zypper install -y make gcc libedit-devel libasan5 libubsan1 python python2-PyYAML lcov
   script:
-    - cd tests
-    - make
-    - cd ..
-    - lcov -t "advent" -o advent.info -c -d .
-    - genhtml -o coverage advent.info
+    - make coverage
   artifacts:
     paths:
       - coverage
   dependencies:
     - binary:debug
 
+test:debug_clang:
+  stage: test
+  before_script:
+    - zypper install -y make clang libedit-devel python python2-PyYAML lcov
+  script:
+    - CC=clang make debug check
+
 test:release:
   stage: test
   before_script:
-    - apk update
-    - apk add make
+    - zypper install -y make libedit
   script:
     - cd tests
     - make
@@ -119,4 +108,3 @@ pages:
     - master
   dependencies:
     - test:debug
-