Changed all states to use M3.9.6

khmarbaise · Dec 20, 2023 · 966f4e3 · 966f4e3
1 parent 81ef778
commit 966f4e3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 8 deletions.
diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml
@@ -25,11 +25,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         name: "Checking out."
-      - uses: actions/setup-java@v3
-        with:
-          java-version: 19
-          distribution: 'temurin'
-
       - name: Cache local Maven repositories
         uses: actions/cache@v3
         with:
@@ -40,6 +35,16 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: "temurin"
+          cache: maven
+      - name: Set up Maven
+        uses: hb0730/maven-action@v1.0.1
+        with:
+          maven-version: 3.9.6
+          url: https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.tar.gz
       - name: Build with Maven
         run: mvn verify -Prun-its -e -B -V --no-transfer-progress
 

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -25,9 +25,33 @@ jobs:
   update-site:
     name: Linux
     runs-on: ubuntu-latest
-    container: maven/eclipse-temurin-21-alpine
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v3
-      - name: 'Build with Maven'
-        run: mvn -V --no-transfer-progress verify site:site site:stage
+      - name: Cache local Maven repositories
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.m2/repository
+            ./**/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: "temurin"
+          cache: maven
+      - name: Set up Maven
+        uses: hb0730/maven-action@v1.0.1
+        with:
+          maven-version: 3.9.6
+          url: https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.tar.gz
+      - name: 'Build'
+        run: unset JAVA_TOOL_OPTIONS;mvn -V --no-transfer-progress verify site:site site:stage
+      - name: 'Deploy to gh-pages'
+        uses: JamesIves/github-pages-deploy-action@releases/v4
+        with:
+          branch: gh-pages
+          folder: target/staging
+          target-folder: snapshot