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/06/02 09:14:03 UTC
[datasketches-memory] 01/04: Matrix tests interim
This is an automated email from the ASF dual-hosted git repository.
dcromberge pushed a commit to branch multi-module-experimental
in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit ababa8f0e9f0c74b62061ae60e37b85a890a6a58
Author: David Cromberge <da...@gmail.com>
AuthorDate: Tue Jun 1 12:48:01 2021 +0100
Matrix tests interim
---
.github/workflows/.toolchains.xml | 60 +++-------------
.github/workflows/maven.yml | 82 +++++++++++++++++-----
datasketches-memory-base-tests/pom.xml | 2 +-
.../datasketches/memory/internal/package-info.java | 19 +++++
4 files changed, 93 insertions(+), 70 deletions(-)
diff --git a/.github/workflows/.toolchains.xml b/.github/workflows/.toolchains.xml
index b3141ba..bade917 100644
--- a/.github/workflows/.toolchains.xml
+++ b/.github/workflows/.toolchains.xml
@@ -3,81 +3,41 @@
<toolchain>
<type>jdk</type>
<provides>
- <version>8</version>
- <vendor>adoptopenjdk</vendor>
+ <version>1.8</version>
+ <vendor>openjdk</vendor>
</provides>
<configuration>
- <jdkHome>${JAVA_HOME}</jdkHome>
+ <jdkHome>${env.JAVA8_HOME}</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
- <version>9</version>
- <vendor>adoptopenjdk</vendor>
+ <version>8</version>
+ <vendor>openjdk</vendor>
</provides>
<configuration>
- <jdkHome>${env.JAVA9_HOME}</jdkHome>
+ <jdkHome>${env.JAVA8_HOME}</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
- <version>10</version>
- <vendor>adoptopenjdk</vendor>
+ <version>9</version>
+ <vendor>openjdk</vendor>
</provides>
<configuration>
- <jdkHome>${env.JAVA10_HOME}</jdkHome>
+ <jdkHome>${env.JAVA9_HOME}</jdkHome>
</configuration>
</toolchain>
<toolchain>
<type>jdk</type>
<provides>
<version>11</version>
- <vendor>adoptopenjdk</vendor>
+ <vendor>openjdk</vendor>
</provides>
<configuration>
<jdkHome>${env.JAVA11_HOME}</jdkHome>
</configuration>
</toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>12</version>
- <vendor>adoptopenjdk</vendor>
- </provides>
- <configuration>
- <jdkHome>${env.JAVA12_HOME}</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>13</version>
- <vendor>adoptopenjdk</vendor>
- </provides>
- <configuration>
- <jdkHome>${env.JAVA13_HOME}</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>15</version>
- <vendor>adoptopenjdk</vendor>
- </provides>
- <configuration>
- <jdkHome>${env.JAVA15_HOME}</jdkHome>
- </configuration>
- </toolchain>
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>16</version>
- <vendor>adoptopenjdk</vendor>
- </provides>
- <configuration>
- <jdkHome>${env.JAVA16_HOME}</jdkHome>
- </configuration>
- </toolchain>
</toolchains>
\ No newline at end of file
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index dbe5a4d..f6f0011 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -9,10 +9,11 @@ on:
env:
MAVEN_OPTS: -Xmx4g -Xms1g
repo_token: ${{secrets.coveralls_token}}
+ RUNNER_TEMP: /tmp
jobs:
- build:
- name: Build, Test, Coverage
+ setup:
+ name: Setup
runs-on: ubuntu-latest
strategy:
matrix:
@@ -20,7 +21,7 @@ jobs:
env:
JDK_VERSION: ${{ matrix.jdk }}
-
+
steps:
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
uses: actions/checkout@v2
@@ -34,20 +35,63 @@ jobs:
key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: build-${{ runner.os }}-maven-
- - name: Install JDK
+ - name: Download Maven
+ run: |
+ curl -sL https://www-eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip
+ apt-get update
+ apt-get -y install unzip
+ unzip -d /usr/share maven.zip
+ rm maven.zip
+ ln -s /usr/share/apache-maven-3.6.3/bin/mvn /usr/bin/mvn
+ echo "M2_HOME=/usr/share/apache-maven-3.6.3" | tee -a /etc/environment
+
+ - name: Install JDK 8
+ uses: AdoptOpenJDK/install-jdk@v1
+ with:
+ version: '8'
+ architecture: x64
+ impl: hotspot
+ targets: 'JAVA8_HOME'
+
+ - name: Install JDK 9
+ uses: AdoptOpenJDK/install-jdk@v1
+ with:
+ version: '9'
+ architecture: x64
+ impl: hotspot
+ targets: 'JAVA9_HOME'
+
+ - name: Install JDK 11
+ uses: AdoptOpenJDK/install-jdk@v1
+ with:
+ version: '11'
+ architecture: x64
+ impl: hotspot
+ targets: 'JAVA11_HOME'
+
+ - name: Install Matrix JDK
uses: AdoptOpenJDK/install-jdk@v1
with:
version: ${{ matrix.jdk }}
architecture: x64
impl: hotspot
+ targets: 'JAVA_HOME'
- - name: Install Dependencies
+ - name: Echo JAVA Home
run: >
- mvn clean install
- -DskipTests=true
- -Dmaven.javadoc.skip=true
- -Dgpg.skip=true
- --toolchains .github/workflows/.toolchains.xml
+ echo $JAVA_HOME
+
+ - name: Echo JAVA Version
+ run: >
+ java -version
+
+ # - name: Install Dependencies
+ # run: >
+ # mvn clean install
+ # -DskipTests=true
+ # -Dmaven.javadoc.skip=true
+ # -Dgpg.skip=true
+ # --toolchains .github/workflows/.toolchains.xml
- name: Package
run: >
@@ -56,12 +100,12 @@ jobs:
-Dgpg.skip=true
--toolchains .github/workflows/.toolchains.xml
- # Purposefully excluded
- # - name: Test & Report
- # if: ${{ matrix.jdk == 8 && success() }}
- # run: >
- # mvn verify coveralls:report -B -V -q
- # -Dcoveralls-repo-token=${repo_token}
- # -Dmaven.javadoc.skip=true
- # -Dgpg.skip=true
- # --toolchains .github/workflows/.toolchains.xml
+ # # Purposefully excluded
+ # # - name: Test & Report
+ # # if: ${{ matrix.jdk == 8 && success() }}
+ # # run: >
+ # # mvn verify coveralls:report -B -V -q
+ # # -Dcoveralls-repo-token=${repo_token}
+ # # -Dmaven.javadoc.skip=true
+ # # -Dgpg.skip=true
+ # # --toolchains .github/workflows/.toolchains.xml
\ No newline at end of file
diff --git a/datasketches-memory-base-tests/pom.xml b/datasketches-memory-base-tests/pom.xml
index d371cd3..8b6569e 100644
--- a/datasketches-memory-base-tests/pom.xml
+++ b/datasketches-memory-base-tests/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.datasketches</groupId>
<artifactId>datasketches-memory</artifactId>
- <version>${parent.version}</version>
+ <version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/datasketches-memory-java9/src/main/java/org/apache/datasketches/memory/internal/package-info.java b/datasketches-memory-java9/src/main/java/org/apache/datasketches/memory/internal/package-info.java
index 3b29727..03c6da3 100644
--- a/datasketches-memory-java9/src/main/java/org/apache/datasketches/memory/internal/package-info.java
+++ b/datasketches-memory-java9/src/main/java/org/apache/datasketches/memory/internal/package-info.java
@@ -1 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.datasketches.memory.internal;
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org