You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by dc...@apache.org on 2021/07/19 11:22:14 UTC
[datasketches-memory] 01/02: Remove matrix profiles
This is an automated email from the ASF dual-hosted git repository.
dcromberge pushed a commit to branch remove-matrix-profiles
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit ab4afc3f6b24aad3aa7f6b6695ddce2d6433e0e3
Author: David Cromberge <dc...@apache.org>
AuthorDate: Mon Jul 19 12:20:58 2021 +0100
Remove matrix profiles
---
.github/workflows/maven.yml | 27 +---
datasketches-memory-resources/pom.xml | 252 +---------------------------------
2 files changed, 5 insertions(+), 274 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 38d3b47..0c4d2f5 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- jdk: [8,9,10,11,12,13]
+ jdk: [8,9,11]
# All JDKs are installed per build machine which is inefficient
@@ -54,14 +54,6 @@ jobs:
impl: hotspot
targets: 'JAVA9_HOME'
- - name: Install JDK 10
- uses: AdoptOpenJDK/install-jdk@v1
- with:
- version: '10'
- architecture: x64
- impl: hotspot
- targets: 'JAVA10_HOME'
-
- name: Install JDK 11
uses: AdoptOpenJDK/install-jdk@v1
with:
@@ -70,22 +62,6 @@ jobs:
impl: hotspot
targets: 'JAVA11_HOME'
- - name: Install JDK 12
- uses: AdoptOpenJDK/install-jdk@v1
- with:
- version: '12'
- architecture: x64
- impl: hotspot
- targets: 'JAVA12_HOME'
-
- - name: Install JDK 13
- uses: AdoptOpenJDK/install-jdk@v1
- with:
- version: '13'
- architecture: x64
- impl: hotspot
- targets: 'JAVA13_HOME'
-
- name: Install Matrix JDK
uses: AdoptOpenJDK/install-jdk@v1
with:
@@ -112,6 +88,7 @@ jobs:
-Dmaven.javadoc.skip=true
-Dgpg.skip=true
-Denvironment=ci
+ -Djava.version=${{matrix.jdk}}
--toolchains .github/workflows/.toolchains.xml
- name: Test & Report
diff --git a/datasketches-memory-resources/pom.xml b/datasketches-memory-resources/pom.xml
index 44c2c79..cb018b4 100644
--- a/datasketches-memory-resources/pom.xml
+++ b/datasketches-memory-resources/pom.xml
@@ -125,9 +125,9 @@
</profile>
<profile>
- <id>java9</id>
+ <id>java9to13</id>
<activation>
- <jdk>9</jdk>
+ <jdk>[9,14)</jdk>
<property>
<name>environment</name>
<value>ci</value>
@@ -135,253 +135,7 @@
</activation>
<properties>
- <jdk-toolchain.version>9</jdk-toolchain.version>
- <java.version>9</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory-java8-tests</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <!-- Apache Parent pom, pluginManagement-->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <executions>
- <execution>
- <id>package-test</id>
- <phase>package</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <argLine>
- --add-opens java.base/java.nio=ALL-UNNAMED
- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
- --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
- </argLine>
- <dependenciesToScan>
- <dependency>org.apache.datasketches:datasketches-memory-java8-tests</dependency>
- </dependenciesToScan>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>java10</id>
- <activation>
- <jdk>10</jdk>
- <property>
- <name>environment</name>
- <value>ci</value>
- </property>
- </activation>
-
- <properties>
- <jdk-toolchain.version>10</jdk-toolchain.version>
- <java.version>10</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory-java8-tests</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <!-- Apache Parent pom, pluginManagement-->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <executions>
- <execution>
- <id>package-test</id>
- <phase>package</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <argLine>
- --add-opens java.base/java.nio=ALL-UNNAMED
- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
- --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
- </argLine>
- <dependenciesToScan>
- <dependency>org.apache.datasketches:datasketches-memory-java8-tests</dependency>
- </dependenciesToScan>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>java11</id>
- <activation>
- <jdk>11</jdk>
- <property>
- <name>environment</name>
- <value>ci</value>
- </property>
- </activation>
-
- <properties>
- <jdk-toolchain.version>11</jdk-toolchain.version>
- <java.version>11</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory-java8-tests</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <!-- Apache Parent pom, pluginManagement-->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <executions>
- <execution>
- <id>package-test</id>
- <phase>package</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <argLine>
- --add-opens java.base/java.nio=ALL-UNNAMED
- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
- --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
- </argLine>
- <dependenciesToScan>
- <dependency>org.apache.datasketches:datasketches-memory-java8-tests</dependency>
- </dependenciesToScan>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>java12</id>
- <activation>
- <jdk>12</jdk>
- <property>
- <name>environment</name>
- <value>ci</value>
- </property>
- </activation>
-
- <properties>
- <jdk-toolchain.version>12</jdk-toolchain.version>
- <java.version>12</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.datasketches</groupId>
- <artifactId>datasketches-memory-java8-tests</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
-
- <plugin>
- <!-- Apache Parent pom, pluginManagement-->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <executions>
- <execution>
- <id>package-test</id>
- <phase>package</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <argLine>
- --add-opens java.base/java.nio=ALL-UNNAMED
- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
- --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
- </argLine>
- <dependenciesToScan>
- <dependency>org.apache.datasketches:datasketches-memory-java8-tests</dependency>
- </dependenciesToScan>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
-
- <profile>
- <id>java13</id>
- <activation>
- <jdk>13</jdk>
- <property>
- <name>environment</name>
- <value>ci</value>
- </property>
- </activation>
-
- <properties>
- <jdk-toolchain.version>13</jdk-toolchain.version>
- <java.version>13</java.version>
+ <jdk-toolchain.version>${java.version}</jdk-toolchain.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org