From 051ab70f8ca88e24d71640696b023be87df92c08 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Wed, 16 Dec 2020 08:55:21 +0100
Subject: update GitLab CI configuration to set code-coverage extractor and
 artifact names for releases

---
 .gitlab-ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17655aa5..acc0e423 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ assemble:
     mvn $MAVEN_CLI_OPTS generate-sources compile test
   after_script:
     - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, " instructions covered"; print 100*covered/instructions, "% covered" }' $JACOCO_CSV_LOCATION    
+  coverage: '/([0-9]{1,3}.[0-9]*).%.covered/'
   artifacts:
     when: always
     reports:
@@ -56,10 +57,10 @@ buildDistributionPackage:
     mvn $MAVEN_CLI_OPTS verify -DskipTests
     echo "VERSION=$VERSION" >> variables.env
   artifacts:
+    name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}"
     when: always
     reports:
-      dotenv: variables.env
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+      dotenv: variables.env    
     paths:
       - $PROJECT_RELEASE_PACKAGE
 
@@ -77,6 +78,7 @@ release:
     echo "Publishing version $VERSION to public EGIZ maven"
     mvn $MAVEN_CLI_OPTS deploy
   artifacts:
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME-EGIZ"
+    name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}-release"
+    expire_in: never
     paths:
       - $PROJECT_RELEASE_PACKAGE         
-- 
cgit v1.2.3