diff options
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4009365f..17655aa5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,8 @@ variables: GIT_DEPTH: "2" SECURE_LOG_LEVEL: "debug" JACOCO_CSV_LOCATION: '${CI_PROJECT_DIR}/build_reporting/target/site/jacoco-aggregate-ut/jacoco.csv' + JACOCO_XML_LOCATION: '${CI_PROJECT_DIR}/build_reporting/target/site/jacoco-aggregate-ut/jacoco.xml' + PROJECT_RELEASE_PACKAGE: '${CI_PROJECT_DIR}/target/*-dist.zip' include: - template: Dependency-Scanning.gitlab-ci.yml @@ -40,7 +42,8 @@ assemble: reports: junit: "**/target/surefire-reports/TEST-*.xml" paths: - - target/jacoco-report/jacoco.xml + - $JACOCO_CSV_LOCATION + - $JACOCO_XML_LOCATION buildDistributionPackage: @@ -49,8 +52,8 @@ buildDistributionPackage: - tags script: | export VERSION=$(mvn -B help:evaluate -Dexpression=project.version -B | grep -v "\[INFO\]" | grep -Po "\d+\.\d+\.\d+((-\w*)+)?") - echo "Build full package of version $VERSION - mvn $MAVEN_CLI_OPTS verify -s .cisettings.xml -DskipTests + echo "Build full package of version $VERSION" + mvn $MAVEN_CLI_OPTS verify -DskipTests echo "VERSION=$VERSION" >> variables.env artifacts: when: always @@ -58,7 +61,7 @@ buildDistributionPackage: dotenv: variables.env name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" paths: - - target/*.-dist.zip + - $PROJECT_RELEASE_PACKAGE release: stage: release @@ -72,8 +75,8 @@ release: script: | echo "Releasing version $VERSION of $LIB_NAME" echo "Publishing version $VERSION to public EGIZ maven" - mvn $MAVEN_CLI_OPTS deploy -s .cisettings.xml + mvn $MAVEN_CLI_OPTS deploy artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME-EGIZ" paths: - - target/*.-dist.zip + - $PROJECT_RELEASE_PACKAGE |