Fix GH action
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index abaacb4..01f54cf 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -23,7 +23,7 @@
on: [push, pull_request]
env:
- MAVEN_OPTS: -Dmaven.repo.local=/home/runner/work/geronimo-arthur/geronimo-arthur/.m2 -Dmaven.artifact.threads=256 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+ MAVEN_OPTS: -Dmaven.repo.local=${{ github.workspace }}/.m2 -Dmaven.artifact.threads=256 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
jobs:
build:
@@ -31,39 +31,54 @@
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ '1.8', '11.0.4' ]
+ java: [ '8', '11' ]
steps:
- - name: Clone
- uses: actions/checkout@v1
- - name: Cache Maven Repository
- uses: actions/cache@v1
- with:
- path: /home/runner/work/geronimo-arthur/geronimo-arthur/.m2
- key: m2_repository
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v1
- with:
- java-version: ${{ matrix.java }}
- - name: Build
- run: mvn install -Pintegration-tests
- - name: Remove Snapshots Before Caching
- run: find /home/runner/work/geronimo-arthur/geronimo-arthur/.m2 -name '*SNAPSHOT' | xargs rm -Rf
+ - name: Checkout Code
+ uses: actions/checkout@v4
+
+ - name: Cache Maven Repository
+ uses: actions/cache@v4
+ with:
+ path: ${{ github.workspace }}/.m2
+ key: m2-${{ runner.os }}-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ m2-${{ runner.os }}-java${{ matrix.java }}-
+
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: ${{ matrix.java }}
+
+ - name: Build with Maven
+ run: mvn install -Pintegration-tests
+
+ - name: Remove SNAPSHOT Artifacts
+ run: find ${{ github.workspace }}/.m2 -name '*SNAPSHOT' | xargs rm -Rf
+
security_audit:
name: Security Audit
runs-on: ubuntu-latest
steps:
- - name: Clone
- uses: actions/checkout@v1
- - name: Cache Maven Repository
- uses: actions/cache@v1
- with:
- path: /home/runner/work/geronimo-arthur/geronimo-arthur/.m2
- key: m2_repository
- - name: Set up JDK
- uses: actions/setup-java@v1
- with:
- java-version: '1.8'
- - name: Build
- run: mvn install -Pintegration-tests -DskipTests -Dexec.skip=true ossindex:audit
- - name: Remove Snapshots Before Caching
- run: find /home/runner/work/geronimo-arthur/geronimo-arthur/.m2 -name '*SNAPSHOT' | xargs rm -Rf
+ - name: Checkout Code
+ uses: actions/checkout@v4
+
+ - name: Cache Maven Repository
+ uses: actions/cache@v4
+ with:
+ path: ${{ github.workspace }}/.m2
+ key: m2-${{ runner.os }}-java8-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ m2-${{ runner.os }}-java8-
+
+ - name: Set up JDK
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: '8'
+
+ - name: Security Audit (OssIndex)
+ run: mvn install -Pintegration-tests -DskipTests -Dexec.skip=true ossindex:audit
+
+ - name: Remove SNAPSHOT Artifacts
+ run: find ${{ github.workspace }}/.m2 -name '*SNAPSHOT' | xargs rm -Rf || true
