Another coverage tweak.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c5a83eb9c3fce4bb4d085593a6128aa30b7c99e..1a695406a6cf87bc13fee2706a320a3bbc9dd581 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: fedora
+image: opensuse:tumbleweed
 
 stages:
   - build
@@ -9,7 +9,7 @@ stages:
 binary:debug:
   stage: build
   before_script:
-    - dnf install make gcc libedit-devel libasan libubsan python2 PyYAML lcov -y
+    - zypper install -y make gcc libedit-devel libasan5 libubsan1 python python2-PyYAML lcov
   script:
     - make debug
   artifacts:
@@ -19,12 +19,11 @@ binary:debug:
       - "*.o"
       - dungeon.c
       - dungeon.h
-      - "*.gcno"
 
 binary:release:
   stage: build
   before_script:
-    - dnf install make gcc libedit-devel python2 PyYAML -y
+    - zypper install -y make gcc libedit-devel python python2-PyYAML
   script:
     - make advent cheat
   artifacts:
@@ -38,7 +37,7 @@ binary:release:
 manpage:
   stage: build
   before_script:
-    - dnf install make asciidoc -y
+    - zypper install -y make asciidoc
   script:
     - make advent.6
   artifacts:
@@ -48,7 +47,7 @@ manpage:
 html:
   stage: build
   before_script:
-    - dnf install make asciidoc libxslt -y
+    - zypper install -y make asciidoc libxslt
   script:
     - make html
   artifacts:
@@ -58,7 +57,7 @@ html:
 dist:
   stage: build
   before_script:
-    - dnf install make asciidoc -y
+    - zypper install -y make asciidoc tar
   script:
     - export VERS=${CI_COMMIT_REF_NAME}
     - make dist -e
@@ -70,23 +69,26 @@ dist:
 test:debug:
   stage: test
   before_script:
-    - dnf install make gcc libedit-devel libasan libubsan python2 PyYAML lcov -y
+    - zypper install -y make gcc libedit-devel libasan5 libubsan1 python python2-PyYAML lcov
   script:
-    - make debug
-    - make check
-    - lcov -t "advent" -o advent.info -c -d .
-    - genhtml -o coverage advent.info
-    - cd tests
-    - ./coverage_dungeon.py
-    - cd ..
+    - 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:
-    - dnf install make libedit -y
+    - zypper install -y make libedit
   script:
     - cd tests
     - make