Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
TextGridRep Portal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
DARIAH-DE
TextGridRep Portal
Commits
56f9bffb
Verified
Commit
56f9bffb
authored
2 years ago
by
Ubbo Veentjer
Browse files
Options
Downloads
Plain Diff
Merge branch 'release/4.0.1'
parents
073d4473
9e0a6d2b
No related branches found
Branches containing commit
Tags
4.0.1
Tags containing commit
No related merge requests found
Pipeline
#303124
passed
2 years ago
Stage: build
Stage: test
Stage: deploy
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+11
-3
11 additions, 3 deletions
.gitlab-ci.yml
build.gradle
+6
-5
6 additions, 5 deletions
build.gradle
with
17 additions
and
8 deletions
.gitlab-ci.yml
+
11
−
3
View file @
56f9bffb
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
build.gradle
+
6
−
5
View file @
56f9bffb
plugins
{
id
'org.springframework.boot'
version
'2.5.1
3
'
id
'org.springframework.boot'
version
'2.5.1
4
'
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'
archive
File
Name
=
'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'
main
Class
=
'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
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment