backported html document creation to be able to compare with latest

Merge branch 'hotfix_21.0.1' into rel21.0.0

.gitlab-ci.yml

@@ -2,10 +2,10 @@ variables:
   ASCIIDOC_IMAGE: marcelhuberfoo/asciidoctor:v20.02.1
 
 stages:
-- build
-- persist
+  - build
+  - persist
 
-before_script: []
+before_script: [ ]
 
 .job_template_asciidoc:
   image: $ASCIIDOC_IMAGE
@@ -16,75 +16,81 @@ before_script: []
     GIT_LFS_SKIP_SMUDGE: 1
     MaxDepth: "1"
     SourceFiles: "_NotThere_.adoc"
-#    OUTPUT_FILENAME: '$$_adoc_basename'
+  #    OUTPUT_FILENAME: '$$_adoc_basename'
   tags:
-  - docker
+    - docker
   script:
-  # fetch minimal set of required LFS files
-  - >
-    git lfs version;
-    git lfs fetch -I **/*.jar && git lfs checkout;
-    git lfs logs last;
-  # add unmodified directory contents first
-  - >
-    test "${JOB_DIR}x" != ".x" && { 7z a $CI_PROJECT_DIR/${CI_JOB_NAME}.zip $JOB_DIR; } || true
-  - >
-    _asciidoctor_cmd='asciidoctor
-    --require asciidoctor-pdf
-    --require asciidoctor-diagram
-    --require asciidoctor-mathematical
-    --attribute revnumber="$(git describe --abbrev --tags --always --dirty='-*')"
-    --attribute revremark="$(git log -1 --pretty=format:%s)"
-    --attribute revdate="$(git log -1 --date=short-local --pretty=format:%cd)"
-    --attribute ci_project_namespace@=$CI_PROJECT_NAMESPACE
-    --attribute ci_project_name@=$CI_PROJECT_NAME
-    --attribute ci_project_dir@=$CI_PROJECT_DIR
-    --attribute ci_project_url@=$CI_PROJECT_URL
-    --attribute ci_project_path@=$CI_PROJECT_PATH
-    --attribute ci_commit_ref_name@=$CI_COMMIT_REF_NAME
-    --attribute ci_commit_tag@=$CI_COMMIT_TAG
-    --attribute doctype@=book
-    --attribute pdf-page-size@="A4"
-    --attribute pdf-page-layout@=portrait
-    --backend pdf
-    --out-file ${_OutputFilename}
-    $_args_
-    ${_InputFilename}';
-  - >
-    _out_basename=${OUTPUT_FILENAME:-${CI_JOB_NAME/-Solutions/}};
-    for _InputFilename in $(find $JOB_DIR -maxdepth ${MaxDepth:-1} "(" -name "${SourceFiles:-q.atsch}" -o -iname README.adoc ")" ); do
-    echo "Inputfile: $_InputFilename";
-    _adoc_basename=$(basename $_InputFilename);
-    _OutputFilename="$(eval "echo $CI_PROJECT_DIR/${JOB_DIR}/${_out_basename}.pdf")";
-    ( echo "  Org-out: $_OutputFilename"; eval $_asciidoctor_cmd ) &
-    if [ "$(grep -m 2 -c "ifdef::exercise_solution" ${_InputFilename} )" = "2" ]; then
-      sed -e 's|^//:exercise_solution:.*$|:exercise_solution:|' ${_InputFilename} > ${_InputFilename/.adoc/.solutions.adoc};
-      _OutputFilename="${_OutputFilename/.pdf/-Solutions.pdf}";
-      _args_="--attribute exercise_solution";
-      ( echo "  Sol-out: $_OutputFilename"; eval $_asciidoctor_cmd ) &
-    fi;
-    done;
-    wait;
-  # update zip file with generated pdf file(s)
-  - >
-    test "${JOB_DIR}x" != ".x" && { 7z u $CI_PROJECT_DIR/${CI_JOB_NAME}.zip $JOB_DIR/*.pdf $JOB_DIR/*.solutions.adoc; } || true
+    # fetch minimal set of required LFS files
+    - >
+      git lfs version;
+      git lfs fetch -I **/*.jar && git lfs checkout;
+      git lfs logs last;
+    # add unmodified directory contents first
+    - >
+      test "${JOB_DIR}x" != ".x" && { 7z a $CI_PROJECT_DIR/${CI_JOB_NAME}.zip $JOB_DIR; } || true
+    - >
+      _asciidoctor_cmd='asciidoctor
+      --require asciidoctor-pdf
+      --require asciidoctor-diagram
+      --require asciidoctor-mathematical
+      --attribute revnumber="$(git describe --abbrev --tags --always --dirty='-*')"
+      --attribute revremark="$(git log -1 --pretty=format:%s)"
+      --attribute revdate="$(git log -1 --date=short-local --pretty=format:%cd)"
+      --attribute ci_project_namespace@=$CI_PROJECT_NAMESPACE
+      --attribute ci_project_name@=$CI_PROJECT_NAME
+      --attribute ci_project_dir@=$CI_PROJECT_DIR
+      --attribute ci_project_url@=$CI_PROJECT_URL
+      --attribute ci_project_path@=$CI_PROJECT_PATH
+      --attribute ci_commit_ref_name@=$CI_COMMIT_REF_NAME
+      --attribute ci_commit_tag@=$CI_COMMIT_TAG
+      --attribute doctype@=book
+      --attribute pdf-page-size@="A4"
+      --attribute pdf-page-layout@=portrait
+      --backend ${output_type:-pdf}
+      --out-file ${_OutputFilename}
+      $_args_
+      ${_InputFilename}';
+    - >
+      _out_basename=${OUTPUT_FILENAME:-${CI_JOB_NAME/-Solutions/}};
+      for output_type in pdf html; do
+        for _InputFilename in $(find $JOB_DIR -maxdepth ${MaxDepth:-1} "(" -name "${SourceFiles:-q.atsch}" -o -iname README.adoc ")" ); do
+          echo "Inputfile: $_InputFilename";
+          _adoc_basename=$(basename $_InputFilename);
+          _OutputFilename="$(eval "echo $CI_PROJECT_DIR/${JOB_DIR}/${_out_basename}.${output_type}")";
+          ( echo "  Org-out: $_OutputFilename"; eval $_asciidoctor_cmd ) &
+          if [ "$(grep -m 2 -c "ifdef::exercise_solution" ${_InputFilename} )" = "2" ]; then
+            sed -e 's|^//:exercise_solution:.*$|:exercise_solution:|' ${_InputFilename} > ${_InputFilename/.adoc/.solutions.adoc};
+            ( _OutputFilename="${_OutputFilename/.${output_type}/-Solutions.${output_type}}";
+              _args_="--attribute exercise_solution";
+              echo "  Sol-out: $_OutputFilename"; eval $_asciidoctor_cmd ) &
+          fi;
+        done;
+      done;
+      wait;
+    # update zip file with generated pdf file(s)
+    - >
+      test "${JOB_DIR}x" != ".x" && { 7z u $CI_PROJECT_DIR/${CI_JOB_NAME}.zip $JOB_DIR/*.pdf $JOB_DIR/*.solutions.adoc; } || true
   artifacts:
-    expire_in: 15 min
+    expire_in: 60 min
     paths:
-    - '${JOB_DIR}/*.pdf'
-    - '${JOB_DIR}/*.adoc'
-    - '*.pdf'
-    - '*.zip'
+      - '${JOB_DIR}/*.pdf'
+      - '${JOB_DIR}/*.html'
+      - '${JOB_DIR}/*.adoc'
+      - '${JOB_DIR}/img/*'
+      - '*.pdf'
+      - '*.html'
+      - 'img/*'
+      - '*.zip'
 
 .job_template_asciidoc_exercise:
   extends: .job_template_asciidoc
   except:
-  - /^.*-Solutions$/
+    - /^.*-Solutions$/
 
 .job_template_asciidoc_solution:
   extends: .job_template_asciidoc
   only:
-  - /^.*-Solutions$/
+    - /^.*-Solutions$/
 
 Overview:
   extends: .job_template_asciidoc
@@ -193,48 +199,41 @@ Abschluss:
 
 Databases:
   image: $ASCIIDOC_IMAGE
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
   stage: build
   tags:
-  - docker
+    - docker
   except:
-  - /^feature.*$/
-  - /^support.*$/
+    - /^feature.*$/
+    - /^support.*$/
   script:
-  - 7z a ${CI_JOB_NAME}.zip $CI_JOB_NAME
+    - 7z a ${CI_JOB_NAME}.zip $CI_JOB_NAME
+  artifacts:
+    expire_in: 60 min
+    paths:
+      - '${CI_JOB_NAME}.zip'
+
+.artifacts_template:
   artifacts:
-    expire_in: 15 min
+    expire_in: 1 day
     paths:
-    - '${CI_JOB_NAME}.zip'
+      - '*.pdf'
+      - '*.html'
+      - 'img/*'
+      - '**/*.pdf'
+      - '**/*.html'
+      - '**/img/*'
+      - '*.zip'
 
 ArtifactsCollection:
+  extends: .artifacts_template
   image: $ASCIIDOC_IMAGE
   stage: persist
   variables:
     # do not fetch lfs contents for bundling previous jobs artifacts
     GIT_LFS_SKIP_SMUDGE: 1
   tags:
-  - docker
+    - docker
   script:
-  - "true"
-  artifacts:
-    expire_in: 1 day
-    paths:
-    - '*.pdf'
-    - '**/*.pdf'
-    - '*.zip'
-
-#Replication:
-#  extends: .job_template_exercise
-#
-#ORDBMS:
-#  extends: .job_template_exercise
-#
-#ORDBMS-Solutions:
-#  extends: .job_template_solution
-#
-#DocumentStore:
-#  extends: .job_template_exercise
-#
-#KeyValueStore:
-#  extends: .job_template_exercise
-#
+    - "true"

VERSION

-21.0.0
+21.0.1