From beb80ff521fd0c5219bbe761c901ce486bca1913 Mon Sep 17 00:00:00 2001
From: "Jason S. Ninneman" <jsn@mbar.us>
Date: Sat, 3 Jun 2017 13:13:49 -0700
Subject: [PATCH] Reconfigure the CI pipeline to deploy more static HTML
 content.

---
 .gitlab-ci.yml | 48 +++++++++++++++++++++++++++++++++++++++++-------
 Makefile       |  5 ++++-
 index.adoc     |  2 ++
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1dcb6c1..935fa3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,24 @@ stages:
   - deploy
 
 # build advent itself
-binary:
+binary:debug:
+  stage: build
+  before_script:
+    - apk update
+    - apk add make gcc musl-dev
+  script: 
+    - make debug
+  artifacts:
+    paths:
+      - advent
+      - "*.gcda"
+      - "*.gcno"
+  # cache outputs to reduce the build time
+  cache:
+    paths:
+      - "*.o"
+
+binary:release:
   stage: build
   before_script:
     - apk update
@@ -16,8 +33,6 @@ binary:
   artifacts:
     paths:
       - advent
-      - "*.gcda"
-      - "*.gcno"
   # cache outputs to reduce the build time
   cache:
     paths:
@@ -29,7 +44,7 @@ manpage:
     - apk update
     - apk add make asciidoc
   script:
-    - make .asc.6
+    - make .adoc.6
   artifacts:
     paths:
       - advent.6
@@ -40,13 +55,13 @@ html:
     - apk update
     - apk add make asciidoc libxslt
   script:
-    - make .asc.html
+    - make html
   artifacts:
     paths:
-      - advent.html
+      - "*.html"
 
 # run tests using the binary built before
-test:
+test:debug:
   stage: test
   before_script:
     - apk update
@@ -61,13 +76,32 @@ test:
   artifacts:
     paths:
       - coverage
+  dependencies:
+    - binary:debug
+
+test:release:
+  stage: test
+  before_script:
+    - apk update
+    - apk add make
+  script:
+    - cd tests
+    - make
+    - cd ..
+  dependencies:
+    - binary:release
 
 pages:
   stage: deploy
   script:
+    - mkdir public
     - mv coverage public
+    - "mv *.html public"
   artifacts:
     paths:
       - public
   only:
     - master
+  dependencies:
+    - html
+    - test:debug
diff --git a/Makefile b/Makefile
index 0f7bd78..ba2c9ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for the open-source release of adventure 2.5
 
 CC?=gcc
-CCFLAGS=-std=c99 -O0 --coverage
+CCFLAGS=-std=c99
 LIBS=
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -68,3 +68,6 @@ release: advent-$(VERS).tar.gz advent.html
 
 refresh: advent.html
 	shipper -N -w version=$(VERS) | sh -e -x
+
+debug: CCFLAGS += -O0 --coverage
+debug: advent
diff --git a/index.adoc b/index.adoc
index ef29252..dacdf44 100644
--- a/index.adoc
+++ b/index.adoc
@@ -14,4 +14,6 @@ You can read:
 
 * a file of link:hints.html[hints].  And these are hints, not spoilers.
 
+* the latest link:coverage[code coverage analysis].
+
 // end