From 68b57a94fae52fb8f18ff6f9e5accde3a203be0e Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Fri, 2 Oct 2020 09:26:13 -0400
Subject: [PATCH] Fixed it so jacoco.xml is generated now.
---
.gitlab-ci.yml | 8 ++++----
pom.xml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8c9f698e..8ee8b1c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ test-nvidia-gpu:
script:
- clinfo
- if [[ "$(clinfo | grep 'Device Type')" != *"GPU"* ]]; then exit -1; fi
- - mvn $MAVEN_CLI_OPTS clean org.jacoco:jacoco-maven-plugin:prepare-agent test jacoco:report site
+ - mvn $MAVEN_CLI_OPTS org.jacoco:jacoco-maven-plugin:prepare-agent test jacoco:report site
- mv target target-nvidia-gpu
artifacts:
when: always
@@ -59,7 +59,7 @@ test-nvidia-cpu:
script:
- clinfo
- if [[ "$(clinfo | grep 'Device Type')" == *"GPU"* ]]; then exit -1; fi
- - mvn $MAVEN_CLI_OPTS clean org.jacoco:jacoco-maven-plugin:prepare-agent test jacoco:report site
+ - mvn $MAVEN_CLI_OPTS org.jacoco:jacoco-maven-plugin:prepare-agent test jacoco:report site
- mv target target-nvidia-cpu
artifacts:
when: always
@@ -78,7 +78,7 @@ test-amdgpu-cpu:
script:
- clinfo
- if [[ "$(clinfo | grep 'Device Type')" == *"GPU"* ]]; then exit -1; fi
- - mvn $MAVEN_CLI_OPTS clean org.jacoco:jacoco-maven-plugin:prepare-agent test jacoco:report site
+ - mvn $MAVEN_CLI_OPTS org.jacoco:jacoco-maven-plugin:prepare-agent test jacoco:report site
- mv target target-amdgpu-cpu
artifacts:
when: always
@@ -97,7 +97,7 @@ test-pocl-cpu:
script:
- clinfo
- if [[ "$(clinfo | grep 'Device Type')" == *"GPU"* ]]; then exit -1; fi
- - mvn $MAVEN_CLI_OPTS clean org.jacoco:jacoco-maven-plugin:prepare-agent test jacoco:report site
+ - mvn $MAVEN_CLI_OPTS org.jacoco:jacoco-maven-plugin:prepare-agent test jacoco:report site
- mv target target-pocl-cpu
artifacts:
when: always
diff --git a/pom.xml b/pom.xml
index 2d62f47a..6806b504 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
<configuration>
<forkCount>6</forkCount>
<reuseForks>false</reuseForks>
- <argLine>-Xmx2048m -XX:MaxPermSize=512m</argLine>
+ <argLine>@{argLine} -Xmx2048m -XX:MaxPermSize=512m</argLine>
</configuration>
</plugin>
<plugin>
--
GitLab