X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=.gitlab-ci.yml;h=0d0ab9d343a90ca642cb5cb72f83e163d8d596d9;hb=be3457abebf606c9251b0708b6add104cdbb8a15;hp=45531263d9cdfcb3988661d9d6e31b5fa160a9a7;hpb=d6cb6f0d8d258f4125fd3a0cc3899541ea2efd5b;p=open-adventure.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4553126..0d0ab9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,56 +1,50 @@
-image: alpine
-
-variables:
-  GIT_SUBMODULE_STRATEGY: "recursive"
-  GIT_SSL_NO_VERIFY: "true"
-
 stages:
+  - ci-build
   - build
   - test
   - deploy
 
+default:
+  image: $CI_REGISTRY_IMAGE:ci
+
+# build and push Docker image to be used in subsequent steps
+ci-build:
+  stage: ci-build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+  script:
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.ci --destination $CI_REGISTRY_IMAGE:ci --cache=true
+
 # build advent itself
 binary:debug:
   stage: build
-  before_script:
-    - apk update
-    - apk add make gcc musl-dev python3
-    - pip3 install PyYAML
-  script: 
+  script:
     - make debug
   artifacts:
     paths:
       - advent
       - cheat
-      - "*.gcda"
-      - "*.gcno"
-  # cache outputs to reduce the build time
-  cache:
-    paths:
       - "*.o"
+      - dungeon.c
+      - dungeon.h
 
 binary:release:
   stage: build
-  before_script:
-    - apk update
-    - apk add make gcc musl-dev python3
-    - pip3 install PyYAML
-  script: 
+  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
   script:
     - make advent.6
   artifacts:
@@ -59,9 +53,6 @@ manpage:
 
 html:
   stage: build
-  before_script:
-    - apk update
-    - apk add make asciidoc libxslt
   script:
     - make html
   artifacts:
@@ -70,9 +61,6 @@ html:
 
 dist:
   stage: build
-  before_script:
-    - apk update
-    - apk add make asciidoc
   script:
     - export VERS=${CI_COMMIT_REF_NAME}
     - make dist -e
@@ -83,16 +71,8 @@ dist:
 # 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
   script:
-    - cd tests
-    - make
-    - cd ..
-    - lcov -t "advent" -o advent.info -c -d .
-    - genhtml -o coverage advent.info
+    - make coverage
   artifacts:
     paths:
       - coverage
@@ -101,9 +81,6 @@ test:debug:
 
 test:release:
   stage: test
-  before_script:
-    - apk update
-    - apk add make
   script:
     - cd tests
     - make
@@ -123,4 +100,3 @@ pages:
     - master
   dependencies:
     - test:debug
-