This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jdeprscan-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 94f5e81 (doc) cleanup toolchain setup
94f5e81 is described below
commit 94f5e814ca2efd96fff21e30d5234d7ff9e04309
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Feb 19 10:09:26 2023 +0100
(doc) cleanup toolchain setup
---
.github/workflows/maven.yaml | 50 ++++++++++----------------------------------
1 file changed, 11 insertions(+), 39 deletions(-)
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index ff4e6b5..294504a 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -25,58 +25,30 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest, macOS-latest ]
- java: [ 8, 11, 16-ea, 17-ea ]
+ java: [ 8, 11, 17 ]
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
- uses: actions/checkout@v2
-
- - name: Set up cache for ~./m2/repository
- uses: actions/[email protected]
- 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 }}-
+ uses: actions/checkout@v3
+#
https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#modifying-maven-toolchains
- name: Install Toolchain JDK
if: ${{ matrix.java == '8' }}
- uses: AdoptOpenJDK/install-jdk@v1
+ uses: actions/setup-java@v3
with:
- version: '11'
- targets: 'TOOLCHAIN_JDK'
- impl: 'openj9'
-
- - name: Set up Toolchain
- if: ${{ matrix.java == '8' }}
- shell: bash
- run: |
- mkdir -p $HOME/.m2 \
- && cat << EOF > $HOME/.m2/toolchains.xml
- <?xml version="1.0" encoding="UTF8"?>
- <toolchains>
- <toolchain>
- <type>jdk</type>
- <provides>
- <version>11</version>
- <vendor>adopt</vendor>
- </provides>
- <configuration>
- <jdkHome>${{ env.TOOLCHAIN_JDK }}</jdkHome>
- </configuration>
- </toolchain>
- </toolchains>
- EOF
+ distribution: 'temurin'
+ java-version: 11
+ cache: 'maven'
- name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v3
with:
+ distribution: 'temurin'
java-version: ${{ matrix.java }}
+ cache: 'maven'
- name: Build with Maven
- run: mvn verify --errors --batch-mode --version '-Prun-its'
-
+ run: mvn verify --errors --batch-mode --show-version -Prun-its
