You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2020/12/24 14:52:34 UTC

[commons-ognl] branch master updated: Make the Travis and HitHub Actions builds use the same Maven goals. Normalize above builds to make them more like other Apache Commons builds.

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e40355b  Make the Travis and HitHub Actions builds use the same Maven goals. Normalize above builds to make them more like other Apache Commons builds.
e40355b is described below

commit e40355b0ad05df1a09630bc138205ea95f28616d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 24 09:52:30 2020 -0500

    Make the Travis and HitHub Actions builds use the same Maven goals.
    Normalize above builds to make them more like other Apache Commons
    builds.
---
 .github/workflows/maven.yml | 21 ++++++++++++++++-----
 .travis.yml                 |  9 +++++++--
 pom.xml                     |  2 ++
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e5a2aa4..3de6082 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -15,21 +15,32 @@
 
 name: Java CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        java: [ '8', '11', '15' ]
+        java: [ 8, 11, 15 ]
+        experimental: [false]
+        include:
+          - java: 16-ea
+            experimental: true        
         
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
+    - uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v1.4.3
       with:
         java-version: ${{ matrix.java }}
     - name: Build with Maven
-      run: mvn -V clean test package
+      run: mvn -V -Ddoclint=all --file pom.xml --no-transfer-progress
diff --git a/.travis.yml b/.travis.yml
index b39a4be..cc26727 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 language: java
-sudo: false
 
 cache:
   directories:
@@ -23,6 +22,12 @@ cache:
 jdk:
   - openjdk8
   - openjdk11
+  - openjdk15
+  - openjdk-ea
+
+matrix:
+  allow_failures:
+    - jdk: openjdk-ea
 
 script:
-  - mvn -V -B clean test
+  - mvn -V --no-transfer-progress
diff --git a/pom.xml b/pom.xml
index 6905515..2a6be2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,6 +219,8 @@ limitations under the License.
   </dependencies>
 
   <build>
+    <!-- TODO SpotBugs, Checkstyle -->
+    <defaultGoal>clean package javadoc:javadoc</defaultGoal>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>