X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=.gitlab-ci.yml;h=1c5a83eb9c3fce4bb4d085593a6128aa30b7c99e;hb=ee7bacc9ec2d701138586fe2b363702c4f46deee;hp=291b943a7e4c1ab5359fd7d33bcbd5e18ed796fa;hpb=b3828c8edca75b5944c5c3aa6205d7c061605591;p=open-adventure.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 291b943..1c5a83e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: alpine
+image: fedora
 
 stages:
   - build
@@ -9,44 +9,36 @@ stages:
 binary:debug:
   stage: build
   before_script:
-    - apk update
-    - apk add make gcc musl-dev python3 libedit-dev
-    - pip3 install PyYAML
-  script: 
+    - dnf install make gcc libedit-devel libasan libubsan python2 PyYAML lcov -y
+  script:
     - make debug
   artifacts:
     paths:
       - advent
       - cheat
-      - "*.gcda"
-      - "*.gcno"
-  # cache outputs to reduce the build time
-  cache:
-    paths:
       - "*.o"
+      - dungeon.c
+      - dungeon.h
+      - "*.gcno"
 
 binary:release:
   stage: build
   before_script:
-    - apk update
-    - apk add make gcc musl-dev python3 libedit-dev
-    - pip3 install PyYAML
-  script: 
+    - dnf install make gcc libedit-devel python2 PyYAML -y
+  script:
     - make advent cheat
   artifacts:
     paths:
       - advent
       - cheat
-  # cache outputs to reduce the build time
-  cache:
-    paths:
       - "*.o"
+      - dungeon.c
+      - dungeon.h
 
 manpage:
   stage: build
   before_script:
-    - apk update
-    - apk add make asciidoc
+    - dnf install make asciidoc -y
   script:
     - make advent.6
   artifacts:
@@ -56,8 +48,7 @@ manpage:
 html:
   stage: build
   before_script:
-    - apk update
-    - apk add make asciidoc libxslt
+    - dnf install make asciidoc libxslt -y
   script:
     - make html
   artifacts:
@@ -67,8 +58,7 @@ html:
 dist:
   stage: build
   before_script:
-    - apk update
-    - apk add make asciidoc
+    - dnf install make asciidoc -y
   script:
     - export VERS=${CI_COMMIT_REF_NAME}
     - make dist -e
@@ -80,25 +70,23 @@ 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
+    - dnf install make gcc libedit-devel libasan libubsan python2 PyYAML lcov -y
   script:
+    - make debug
+    - make check
+    - lcov -t "advent" -o advent.info -c -d .
+    - genhtml -o coverage advent.info
     - cd tests
-    - make
-    - make coverage
+    - ./coverage_dungeon.py
     - cd ..
   artifacts:
     paths:
       - coverage
-  dependencies:
-    - binary:debug
 
 test:release:
   stage: test
   before_script:
-    - apk update
-    - apk add make
+    - dnf install make libedit -y
   script:
     - cd tests
     - make
@@ -118,4 +106,3 @@ pages:
     - master
   dependencies:
     - test:debug
-