aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2020-12-16 11:19:38 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2020-12-16 11:19:38 +0100
commitc9de974247b23c2ac0a997ef25f70b9a75cd1aaf (patch)
treef0f0f512574559bce826c4c898814737c7d48006
parent47e2b6c838233aec6482ae81db91d8d48f0d3ea3 (diff)
parent051ab70f8ca88e24d71640696b023be87df92c08 (diff)
downloadNational_eIDAS_Gateway-c9de974247b23c2ac0a997ef25f70b9a75cd1aaf.tar.gz
National_eIDAS_Gateway-c9de974247b23c2ac0a997ef25f70b9a75cd1aaf.tar.bz2
National_eIDAS_Gateway-c9de974247b23c2ac0a997ef25f70b9a75cd1aaf.zip
Merge branch 'feature/EID_connection' into 'nightlybuild'
update GitLab CI configuration to set code-coverage extractor and artifact names for releases See merge request egiz/eidas_at_proxy!3
-rw-r--r--.gitlab-ci.yml8
1 files changed, 5 insertions, 3 deletions
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