Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
minerva
core
Commits
0431e9e6
Commit
0431e9e6
authored
2 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
uniform way of providing java-17 options to surefire
parent
b8e16803
No related branches found
No related tags found
2 merge requests
!1700
Resolve "introduce new frontend to the jar file build process"
,
!1506
simplify Java 17 compliance
Pipeline
#57661
passed
2 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-3
2 additions, 3 deletions
.gitlab-ci.yml
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
with
3 additions
and
4 deletions
.gitlab-ci.yml
+
2
−
3
View file @
0431e9e6
...
@@ -56,7 +56,6 @@ test:frontend:
...
@@ -56,7 +56,6 @@ test:frontend:
coverage
:
'
/(\d+.\d+)
\%
covered/'
coverage
:
'
/(\d+.\d+)
\%
covered/'
before_script
:
before_script
:
# java.desktop module does not export Sun Graphics implementation for mockito
# java.desktop module does not export Sun Graphics implementation for mockito
-
export MAVEN_ARGS=-DsurefireArgLine=--add-opens=java.desktop/sun.java2d=ALL-UNNAMED
-
apt-get update
-
apt-get update
-
DEBIAN_FRONTEND=noninteractive apt-get install -y libxrender1 libxtst6 fontconfig libfreetype6
-
DEBIAN_FRONTEND=noninteractive apt-get install -y libxrender1 libxtst6 fontconfig libfreetype6
-
mvn dependency:purge-local-repository -DmanualInclude="lcsb.mapviewer"
-
mvn dependency:purge-local-repository -DmanualInclude="lcsb.mapviewer"
...
@@ -80,7 +79,7 @@ test:frontend:
...
@@ -80,7 +79,7 @@ test:frontend:
-
export DISPLAY=:99
-
export DISPLAY=:99
-
mvn -DskipTests=true clean install -pl commons -am
-
mvn -DskipTests=true clean install -pl commons -am
-
mvn test -pl commons
$MAVEN_ARGS
-
mvn test -pl commons
-
awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions,"% covered" }' commons/target/site/jacoco/jacoco.csv
-
awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions,"% covered" }' commons/target/site/jacoco/jacoco.csv
.test_backend_annotation_template
:
.test_backend_annotation_template
:
...
@@ -111,7 +110,7 @@ test:frontend:
...
@@ -111,7 +110,7 @@ test:frontend:
.test_backend_converter_graphics_template
:
.test_backend_converter_graphics_template
:
script
:
&test_backend_converter_graphics_definition
script
:
&test_backend_converter_graphics_definition
-
mvn -DskipTests=true clean install -pl converter-graphics -am
-
mvn -DskipTests=true clean install -pl converter-graphics -am
-
mvn test -pl converter-graphics
$MAVEN_ARGS
-
mvn test -pl converter-graphics
-
awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions,"% covered" }' converter-graphics/target/site/jacoco/jacoco.csv
-
awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions,"% covered" }' converter-graphics/target/site/jacoco/jacoco.csv
.test_backend_converter_CellDesigner_template
:
.test_backend_converter_CellDesigner_template
:
...
...
This diff is collapsed.
Click to expand it.
pom.xml
+
1
−
1
View file @
0431e9e6
...
@@ -214,7 +214,7 @@
...
@@ -214,7 +214,7 @@
<configuration>
<configuration>
<useSystemClassLoader>
false
</useSystemClassLoader>
<useSystemClassLoader>
false
</useSystemClassLoader>
<surefire.rerunFailingTestsCount>
4
</surefire.rerunFailingTestsCount>
<surefire.rerunFailingTestsCount>
4
</surefire.rerunFailingTestsCount>
<argLine>
@{argLine} ${surefireArgLine}
</argLine>
<argLine>
@{argLine} ${surefireArgLine}
--add-opens=java.desktop/sun.java2d=ALL-UNNAMED -XX:+IgnoreUnrecognizedVMOptions
</argLine>
</configuration>
</configuration>
</plugin>
</plugin>
<plugin>
<plugin>
...
...
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