You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by va...@apache.org on 2020/04/21 23:36:49 UTC

[commons-crypto] branch master updated: CI Improvements (#96)

This is an automated email from the ASF dual-hosted git repository.

vanzin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git


The following commit(s) were added to refs/heads/master by this push:
     new 2489786  CI Improvements (#96)
2489786 is described below

commit 24897862c41a504a6987a65727669268019f6f2f
Author: Adam Retter <ad...@googlemail.com>
AuthorDate: Wed Apr 22 01:36:43 2020 +0200

    CI Improvements (#96)
    
    * Tidies up the Travis CI configuration
    * Adds Arm64 builds to Travis CI
    * Adds ppc64le builds to Travis CI
---
 .travis.yml | 98 ++++++++++++++++++++++++++++++++++++++++++++++++-------------
 pom.xml     |  4 +++
 2 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 796de8e..2bd7c8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,28 +18,84 @@ language: java
 
 matrix:
   include:
-    - name: "Ubuntu 14.04 / Java 8 / OpenSSL 1.0.x"
+
+    - name: "x64 / Ubuntu 14.04 / Java 8 / OpenSSL 1.0.x"
+      arch: amd64
       os: linux
       dist: trusty
-      before_install:
-        - "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;'  http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d `jdk_switcher home oraclejdk8`/jre/lib/security && rm /tmp/policy.zip"
-        - openssl version -a
-      after_success:
-        - mvn clean test jacoco:report coveralls:report
-    - name: "OS X / Java 8 / LibreSSL"
+      jdk: openjdk8
+
+    - name: "x64 / Ubuntu 18.04 / Java 8 / OpenSSL 1.1.x"
+      arch: amd64
+      os: linux
+      dist: bionic
+      jdk: openjdk8
+
+    - name: "aarch64 / Ubuntu 16.04 / Java 8 / OpenSSL 1.0.x"
+      arch: arm64
+      os: linux
+      dist: xenial
+      jdk: openjdk8
+      env:
+        - JAVA_HOME=/usr/lib/jvm/adoptopenjdk-8-hotspot-arm64
+      addons:
+        apt:
+          packages:
+            - maven
+
+    - name: "aarch64 / Ubuntu 18.04 / Java 8 / OpenSSL 1.1.x"
+      arch: arm64
+      os: linux
+      dist: bionic
+      jdk: openjdk8
+      env:
+        - JAVA_HOME=/usr/lib/jvm/adoptopenjdk-8-hotspot-arm64
+      addons:
+        apt:
+          packages:
+            - maven
+
+    - name: "ppc64le / Ubuntu 16.04 / Java 8 / OpenSSL 1.0.x"
+      arch: ppc64le
+      os: linux
+      dist: xenial
+      jdk: openjdk8
+      env:
+        - JAVA_HOME=/usr/lib/jvm/adoptopenjdk-8-hotspot-ppc64el
+      addons:
+        apt:
+          packages:
+            - maven
+
+    - name: "ppc64le / Ubuntu 18.04 / Java 8 / OpenSSL 1.1.x"
+      arch: ppc64le
+      os: linux
+      dist: bionic
+      jdk: openjdk8
+      env:
+        - JAVA_HOME=/usr/lib/jvm/adoptopenjdk-8-hotspot-ppc64el
+      addons:
+        apt:
+          packages:
+            - maven
+
+    - name: "OS X / Java 8 / LibreSSL 2.2.x"
       os: osx
       osx_image: xcode9.3
-      before_install:
-        - "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;'  http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d /Library/Java/JavaVirtualMachines/jdk1.8.0_112.jdk/Contents/Home/jre/lib/security && rm /tmp/policy.zip"
-        - openssl version -a
-      after_success:
-        - mvn clean test jacoco:report coveralls:report
-      
-jdk:
-  - oraclejdk8
-
-script:
-  - mvn apache-rat:check
-  - mvn verify
-  - mvn site
-  - mvn clirr:check
+      jdk: oraclejdk8
+      env:
+        - JAVA_HOME=$(/usr/libexec/java_home)
+
+before_install:
+  - |
+    curl -L --cookie 'oraclelicense=accept-securebackup-cookie;' http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip
+    sudo unzip -j -o /tmp/policy.zip *.jar -d $JAVA_HOME/jre/lib/security
+    rm /tmp/policy.zip
+  - openssl version -a
+install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+script: mvn test jacoco:report coveralls:report -B -V
+after_success: mvn site -B -V
+
+cache:
+  directories:
+    - $HOME/.m2
diff --git a/pom.xml b/pom.xml
index 2202702..90d6878 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,6 +256,10 @@ The following provides more details on the included cryptographic software:
       <name>Tian Jianguo</name>
       <email>jianguo.tian@intel.com</email>
     </contributor>
+    <contributor>
+      <name>Adam Retter</name>
+      <organization>Evolved Binary</organization>
+    </contributor>
   </contributors>
 
   <profiles>