refactor pipeline

.gitlab-ci.yml

@@ -2,53 +2,47 @@ stages:
   - build
   - publish
 
-build_tagged_guide:
+.template:build_guide:
   stage: build
   image: alpine
-  script:
+  before_script:
     - apk update
-    - apk add ruby asciidoctor git
+    - apk add --no-cache ruby asciidoctor git
     - gem install asciidoctor-pdf --pre
-    - export COMMIT_TIME=$(git show -s --format=%ci $CI_COMMIT_SHA | cut -c1-10)
-    - asciidoctor-pdf -a revnumber=$CI_COMMIT_TAG -a revdate=$COMMIT_TIME -o angelguide_en.pdf guide.adoc
-    - asciidoctor-pdf -a lang=de -a revnumber=$CI_COMMIT_TAG -a revdate=$COMMIT_TIME -o angelguide_de.pdf guide.adoc
   artifacts:
     paths:
       - "angelguide_en.pdf"
       - "angelguide_de.pdf"
     expire_in: 12 months
+
+build_guide_by_tag:
+  extends: .template:build_guide
+  script:
+    - export COMMIT_DATE=$(git show -s --format=%ci $CI_COMMIT_SHA | cut -c1-10)
+    - export REVISION=$CI_COMMIT_TAG
+    - asciidoctor-pdf -a revnumber=$REVISION -a revdate=$COMMIT_DATE -o angelguide_en.pdf guide.adoc
+    - asciidoctor-pdf -a revnumber=$REVISION -a revdate=$COMMIT_DATE -o angelguide_de.pdf -a lang=de guide.adoc
   rules:
     - if: $CI_COMMIT_TAG != null
       when: always
-    - when: never
   
 build_guide:
-  stage: build
-  image: alpine
+  extends: .template:build_guide
   script:
-    - apk update
-    - apk add ruby asciidoctor git
-    - gem install asciidoctor-pdf --pre
-    - export COMMIT_TIME=$(git show -s --format=%ci $CI_COMMIT_SHA | cut -c1-10)
-    - echo $COMMIT_TIME
-    - asciidoctor-pdf -a revnumber=$CI_COMMIT_SHORT_SHA -a revdate=$COMMIT_TIME -o angelguide_en.pdf guide.adoc
-    - asciidoctor-pdf -a lang=de -a revnumber=$CI_COMMIT_SHORT_SHA -a revdate=$COMMIT_TIME -o angelguide_de.pdf guide.adoc
-  artifacts:
-    paths:
-      - "angelguide_en.pdf"
-      - "angelguide_de.pdf"
-    expire_in: 12 months
+    - export COMMIT_DATE=$(git show -s --format=%ci $CI_COMMIT_SHA | cut -c1-10)
+    - export REVISION=$CI_COMMIT_SHORT_SHA
+    - asciidoctor-pdf -a revnumber=$REVISION -a revdate=$COMMIT_DATE -o angelguide_en.pdf guide.adoc
+    - asciidoctor-pdf -a revnumber=$REVISION -a revdate=$COMMIT_DATE -o angelguide_de.pdf -a lang=de guide.adoc
   rules:
     - if: $CI_COMMIT_TAG == null
       when: always
-    - when: never
 
 publish_guide:
   stage: publish
   image: kroniak/ssh-client
   before_script:
     - apk update
-    - apk add rsync
+    - apk add --no-cache rsync
     - mkdir -p ~/.ssh
     - chmod 700 ~/.ssh
     - eval $(ssh-agent -s)

build.sh

+#!/bin/sh
+
+if [[ $# ne 1 ]]; then
+	echo expected revision as option >&2
+	exit 1
+fi
+
+revision="$1"
+commit_date=$(git show -s --format=%ci $CI_COMMIT_SHA | cut -c1-10)
+
+asciidoctor-pdf -a revnumber=${revision} -a revdate=${commit_date} -o angelguide_en.pdf guide.adoc
+asciidoctor-pdf -a revnumber=${revision} -a revdate=${commit_date} -o angelguide_de.pdf -a lang=de guide.adoc