From 5653ee825ee28fcc1d9fc1dfcc0ee8291ff22c60 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 18 Oct 2021 17:08:32 +1000 Subject: [PATCH 1/4] use shared action Signed-off-by: Olivier Lamy --- .github/workflows/maven.yml | 44 +++++++++++-------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9b76eb08..9898bff4 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -17,38 +17,20 @@ name: GitHub CI -on: [push, pull_request] +on: + push: + branches-ignore: + - dependabot/** + pull_request: jobs: - build: - - strategy: - matrix: - os: [ubuntu-latest,windows-latest, macOS-latest] - java: [8, 11, 14, 15, 16, 17-ea] - jdk: [adopt-hotspot, zulu, adopt-openj9] - fail-fast: false - - runs-on: ${{ matrix.os }} - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up cache for ~./m2/repository - uses: actions/cache@v2.1.6 - with: - path: ~/.m2/repository - key: maven-${{ matrix.os }}-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }} - restore-keys: | - maven-${{ matrix.os }}-java${{ matrix.java }}- - maven-${{ matrix.os }}- - - - name: Set up JDK - uses: actions/setup-java@v2 - with: - distribution: ${{ matrix.jdk }} - java-version: ${{ matrix.java }} + build: + name: Build it + uses: codehaus-plexus/.github/.github/workflows/maven.yml@v0.0.1 + with: + jdk-matrix: '["8", "11", "14", "15", "16", "17"]' + jdk-distribution-matrix: '["adopt-hotspot", "zulu", "adopt-openj9", "temurin"]' + os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]' + maven_args: 'mvn verify javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx' - - name: Build with Maven - run: mvn verify javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx From 470a57085c7628bf45fc8c59d8c901c50d128d7c Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 18 Oct 2021 17:09:25 +1000 Subject: [PATCH 2/4] use shared action Signed-off-by: Olivier Lamy --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9898bff4..d09be126 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -32,5 +32,5 @@ jobs: jdk-matrix: '["8", "11", "14", "15", "16", "17"]' jdk-distribution-matrix: '["adopt-hotspot", "zulu", "adopt-openj9", "temurin"]' os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]' - maven_args: 'mvn verify javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx' + maven_args: 'verify javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx' From 0b015947f88dc79a37f27322ae6576da4e64ceff Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 18 Oct 2021 17:12:48 +1000 Subject: [PATCH 3/4] use shared action Signed-off-by: Olivier Lamy --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d09be126..d6c039e3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,7 +29,7 @@ jobs: name: Build it uses: codehaus-plexus/.github/.github/workflows/maven.yml@v0.0.1 with: - jdk-matrix: '["8", "11", "14", "15", "16", "17"]' + jdk-matrix: '["8", "11", "16", "17"]' jdk-distribution-matrix: '["adopt-hotspot", "zulu", "adopt-openj9", "temurin"]' os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]' maven_args: 'verify javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx' From 247d20fdd8493da00d2d5372ad3722f6cce5d26f Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 18 Oct 2021 17:50:37 +1000 Subject: [PATCH 4/4] remove adopt-openj9 Signed-off-by: Olivier Lamy --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d6c039e3..3bee7702 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -30,7 +30,7 @@ jobs: uses: codehaus-plexus/.github/.github/workflows/maven.yml@v0.0.1 with: jdk-matrix: '["8", "11", "16", "17"]' - jdk-distribution-matrix: '["adopt-hotspot", "zulu", "adopt-openj9", "temurin"]' + jdk-distribution-matrix: '["adopt-hotspot", "zulu", "temurin"]' os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]' maven_args: 'verify javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx'