aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2022-01-10 15:33:27 +0000
committerThomas Lenz <thomas.lenz@egiz.gv.at>2022-01-10 15:33:27 +0000
commit29868d8000773c74c395891bebb685a3252e13ec (patch)
treed6cfb12b0a0f8c305d77adf360a495717fed93a9 /.gitlab-ci.yml
parentf02787f6186169aef9e5fc131b4c82cded1b615a (diff)
parent325c3aff4e4d272072e09de66c06493ebd9858ec (diff)
downloadNational_eIDAS_Gateway-29868d8000773c74c395891bebb685a3252e13ec.tar.gz
National_eIDAS_Gateway-29868d8000773c74c395891bebb685a3252e13ec.tar.bz2
National_eIDAS_Gateway-29868d8000773c74c395891bebb685a3252e13ec.zip
Merge branch 'feature/matching_refactoring' into 'feature/matching_base'
Fixing some issues See merge request egiz/eidas_at_proxy!12
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml16
1 files changed, 7 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cecaf7f..df21e049 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,10 @@ include:
- template: Dependency-Scanning.gitlab-ci.yml
- template: Secret-Detection.gitlab-ci.yml
+default:
+ tags:
+ - docker
+
stages:
- assemble
- test
@@ -30,14 +34,12 @@ cache:
assemble:
stage: assemble
- tags:
- - docker
except:
- tags
script: |
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
+ - 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
@@ -50,8 +52,6 @@ assemble:
buildDistributionPackage:
stage: package
- tags:
- - docker
except:
- tags
- /^feature/.*$/i
@@ -64,15 +64,13 @@ buildDistributionPackage:
name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}"
when: always
reports:
- dotenv: variables.env
+ dotenv: variables.env
paths:
- $PROJECT_RELEASE_PACKAGE
release:
stage: release
image: registry.gitlab.com/gitlab-org/release-cli:latest
- tags:
- - docker
needs:
- job: buildDistributionPackage
artifacts: true
@@ -87,4 +85,4 @@ release:
name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}-release"
expire_in: never
paths:
- - $PROJECT_RELEASE_PACKAGE
+ - $PROJECT_RELEASE_PACKAGE