X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=.gitlab-ci.yml;h=b8f4b9143502cb6870c52ac7ac78aa4277edb2eb;hb=HEAD;hp=e6d8543d0d2331716e116dddb1d589d27944bf96;hpb=d529a143567da29ccfd4ece14c21893cf8a6623d;p=open-adventure.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6d8543..b8f4b91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,52 +1,52 @@
-image: alpine
-
+# SPDX-FileCopyrightText: (C) Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 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 libedit-dev
-    - 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 libedit-dev
-    - 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:
@@ -55,9 +55,6 @@ manpage:
 
 html:
   stage: build
-  before_script:
-    - apk update
-    - apk add make asciidoc libxslt
   script:
     - make html
   artifacts:
@@ -66,9 +63,6 @@ html:
 
 dist:
   stage: build
-  before_script:
-    - apk update
-    - apk add make asciidoc
   script:
     - export VERS=${CI_COMMIT_REF_NAME}
     - make dist -e
@@ -79,15 +73,8 @@ dist:
 # run tests using the binary built before
 test:debug:
   stage: test
-  before_script:
-    - apk update
-    - apk add make gcc libedit-dev
-    - apk add lcov --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted
   script:
-    - cd tests
-    - make
     - make coverage
-    - cd ..
   artifacts:
     paths:
       - coverage
@@ -96,9 +83,6 @@ test:debug:
 
 test:release:
   stage: test
-  before_script:
-    - apk update
-    - apk add make libedit
   script:
     - cd tests
     - make
@@ -118,4 +102,3 @@ pages:
     - master
   dependencies:
     - test:debug
-