From 2e1ceba99dc37bfb705151e87d3af7388a3a8384 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Thu, 1 Oct 2020 23:11:44 -0400
Subject: [PATCH] Added site generation so jacoco reporting can work.
---
.gitlab-ci.yml | 8 ++++----
pom.xml | 17 -----------------
2 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9897087..8c9f698e 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
+ - mvn $MAVEN_CLI_OPTS clean 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
+ - mvn $MAVEN_CLI_OPTS clean 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
+ - mvn $MAVEN_CLI_OPTS clean 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
+ - mvn $MAVEN_CLI_OPTS clean 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 d579f2ef..2d62f47a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,23 +148,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>com.github.github</groupId>
- <artifactId>site-maven-plugin</artifactId>
- <configuration>
- <server>github</server>
- <message>Creating site for aparapi</message>
- <merge>true</merge>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>site</goal>
- </goals>
- <phase>site</phase>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
--
GitLab