Verified Commit 56f9bffb authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

Merge branch 'release/4.0.1'

parents 073d4473 9e0a6d2b
Pipeline #303124 passed with stages
in 6 minutes and 4 seconds
......@@ -6,6 +6,10 @@ include:
- template: Container-Scanning.gitlab-ci.yml
- template: Secret-Detection.gitlab-ci.yml
- template: Code-Quality.gitlab-ci.yml
- project: 'dariah-de/gitlab-templates'
ref: 'main'
file: '/templates/SBOM-Upload.gitlab-ci.yml'
variables:
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
......@@ -26,7 +30,6 @@ variables:
stages:
- build
- test
- package
- deploy
build:
......@@ -48,12 +51,15 @@ test:
script:
- gradle check
- awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, " instructions covered"; print 100*covered/instructions, "% covered" }' build/reports/jacoco/test/jacocoTestReport.csv
- gradle cyclonedxBom
- cp build/reports/bom.json .
coverage: /\d+.\d+ \% covered/
artifacts:
reports:
junit: build/test-results/test/TEST-*.xml
paths:
- build/reports/jacoco/
- bom.json
cache:
key: "$CI_COMMIT_REF_NAME"
policy: pull
......@@ -62,6 +68,8 @@ test:
- .gradle
snapshot_warn:
stage: test
needs: []
image: gradle:jdk11
allow_failure: true
script: |
......@@ -77,7 +85,7 @@ tag-dev-image:
image:
name: gcr.io/go-containerregistry/crane:debug
entrypoint: [""]
stage: package
stage: deploy
before_script:
- *crane-setup
script:
......@@ -92,7 +100,7 @@ release-image:
image:
name: gcr.io/go-containerregistry/crane:debug
entrypoint: [""]
stage: package
stage: deploy
before_script:
- *crane-setup
script:
......
plugins {
id 'org.springframework.boot' version '2.5.13'
id 'org.springframework.boot' version '2.5.14'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'com.github.node-gradle.node' version '2.2.4'
id 'io.miret.etienne.sass' version '1.1.1'
id 'org.cyclonedx.bom' version '1.6.1'
id 'jacoco'
id 'java'
id 'war'
}
group = 'info.textgrid.rep'
version = '4.0.0'
version = '4.0.1'
sourceCompatibility = '1.8'
bootWar {
archiveName 'portal.war'
archiveFileName = 'portal.war'
}
// build images with executable war. spring-boot 2.5 should fix this
......@@ -76,7 +77,7 @@ node {
task compileJs(type: JavaExec) {
classpath configurations.closureCompiler
main = 'com.google.javascript.jscomp.CommandLineRunner'
mainClass = 'com.google.javascript.jscomp.CommandLineRunner'
def closureArgs = []
//append all your command line options here
......@@ -142,7 +143,7 @@ test {
jacocoTestReport {
reports {
csv.enabled true
csv.required = true
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment