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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a5e791..1c5a83e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: alpine
+image: fedora
 
 stages:
   - build
@@ -9,42 +9,38 @@ stages:
 binary:debug:
   stage: build
   before_script:
-    - apk update
-    - apk add make gcc musl-dev
-  script: 
+    - dnf install make gcc libedit-devel libasan libubsan python2 PyYAML lcov -y
+  script:
     - make debug
   artifacts:
     paths:
       - advent
-      - "*.gcda"
-      - "*.gcno"
-  # cache outputs to reduce the build time
-  cache:
-    paths:
+      - cheat
       - "*.o"
+      - dungeon.c
+      - dungeon.h
+      - "*.gcno"
 
 binary:release:
   stage: build
   before_script:
-    - apk update
-    - apk add make gcc musl-dev
-  script: 
-    - make advent
+    - dnf install make gcc libedit-devel python2 PyYAML -y
+  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
+    - dnf install make asciidoc -y
   script:
-    - make .adoc.6
+    - make advent.6
   artifacts:
     paths:
       - advent.6
@@ -52,38 +48,45 @@ manpage:
 html:
   stage: build
   before_script:
-    - apk update
-    - apk add make asciidoc libxslt
+    - dnf install make asciidoc libxslt -y
   script:
     - make html
   artifacts:
     paths:
       - "*.html"
 
+dist:
+  stage: build
+  before_script:
+    - dnf install make asciidoc -y
+  script:
+    - export VERS=${CI_COMMIT_REF_NAME}
+    - make dist -e
+  artifacts:
+    paths:
+      - "*.tar.gz"
+
 # run tests using the binary built before
 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:
-    - cd tests
-    - make
-    - cd ..
+    - make debug
+    - make check
     - lcov -t "advent" -o advent.info -c -d .
     - genhtml -o coverage advent.info
+    - cd tests
+    - ./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
@@ -96,27 +99,10 @@ pages:
   script:
     - mkdir public
     - mv coverage public
-    - "mv *.html public"
   artifacts:
     paths:
       - public
   only:
     - master
   dependencies:
-    - html
     - test:debug
-
-package:
-  stage: deploy
-  script:
-    - mv README.adoc README
-  artifacts:
-    paths:
-      - advent
-      - NEWS
-      - COPYING
-      - README
-      - advent.6
-  dependencies:
-    - binary:release
-    - manpage