diff options
| author | Thomas <> | 2022-05-13 08:59:16 +0200 |
|---|---|---|
| committer | Thomas <> | 2022-05-13 08:59:16 +0200 |
| commit | a11517f4d25f31e352a9665392ad000dff4a44c5 (patch) | |
| tree | d9bbd0b09c68b0d86bd43ae5ccb5b277fd9c3fd3 /.gitlab-ci.yml | |
| parent | 9e3b78d931d220e1ed5ecbaadcb13df7cbe96e22 (diff) | |
| parent | e412bda31b304821c08d8f8c7b2473d67246dba0 (diff) | |
| download | National_eIDAS_Gateway-a11517f4d25f31e352a9665392ad000dff4a44c5.tar.gz National_eIDAS_Gateway-a11517f4d25f31e352a9665392ad000dff4a44c5.tar.bz2 National_eIDAS_Gateway-a11517f4d25f31e352a9665392ad000dff4a44c5.zip | |
Merge branch 'nightlybuild' into feature/ms_proxy_before_refactoring
# Conflicts:
# basicConfig/templates/error_message.html
# connector/src/main/resources/specific_eIDAS_connector.beans.xml
# connector/src/test/resources/config/junit_config_1_springboot.properties
# connector/src/test/resources/config/junit_config_2_springboot.properties
# connector/src/test/resources/config/templates/countrySelection.html
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
# pom.xml
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22f45cd1..9dd8d862 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,8 +20,8 @@ include: default: tags: - - docker - + - docker + stages: - assemble - test @@ -37,9 +37,10 @@ assemble: except: - tags script: | - mvn $MAVEN_CLI_OPTS generate-sources compile test + mkdir ./target + mvn $MAVEN_CLI_OPTS --log-file ./target/mvn_build.log 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 + - 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 @@ -48,6 +49,7 @@ assemble: paths: - $JACOCO_CSV_LOCATION - $JACOCO_XML_LOCATION + - "**/target/mvn_build.log" buildDistributionPackage: @@ -64,7 +66,7 @@ buildDistributionPackage: name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}" when: always reports: - dotenv: variables.env + dotenv: variables.env paths: - $PROJECT_RELEASE_PACKAGE @@ -85,4 +87,4 @@ release: name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}-release" expire_in: never paths: - - $PROJECT_RELEASE_PACKAGE + - $PROJECT_RELEASE_PACKAGE |