Use actions/setup-java to setup JAVA_HOME

This should have no impact as the action should use the preinstalled JDKs anyway. Also update other actions (besides gradle-build-action), and test wiht Gradle 7.5.1
tbroyer · Nov 6, 2022 · 2a79b7c · 2a79b7c
1 parent 41c9168
commit 2a79b7c
Showing 1 changed file with 31 additions and 15 deletions.
diff --git a/.github/workflows/gradle.yaml b/.github/workflows/gradle.yaml
@@ -17,10 +17,12 @@ jobs:
   linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Setup environment
-        run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" | tee -a $GITHUB_ENV
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '8'
 
       - name: Build with Gradle
         id: gradle-build
@@ -34,7 +36,7 @@ jobs:
 
       - name: Store reports
         if: steps.gradle-build.outcome == 'success' || steps.gradle-build.outcome == 'failure'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: linux-reports
           path: build/reports/
@@ -44,15 +46,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        gradle: [ '7.5', '7.4.2', '7.3.3', '7.2', '7.1.1', '7.0.2', '6.8.3', '6.7.1', '6.6.1', '6.5.1', '6.4.1', '6.3', '6.2.2', '6.1.1', '6.0.1', '5.6.4', '5.5.1', '5.4.1', '5.3.1', '5.2.1' ]
+        gradle: [ '7.5.1', '7.4.2', '7.3.3', '7.2', '7.1.1', '7.0.2', '6.8.3', '6.7.1', '6.6.1', '6.5.1', '6.4.1', '6.3', '6.2.2', '6.1.1', '6.0.1', '5.6.4', '5.5.1', '5.4.1', '5.3.1', '5.2.1' ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Setup environment
-        run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" | tee -a $GITHUB_ENV
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '8'
 
       - name: Cache Gradle test wrapper (${{ matrix.gradle }})
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.gradle/wrapper/dists/gradle-${{ matrix.gradle }}-bin/
           key: wrapper-${{ matrix.gradle }}
@@ -69,7 +73,7 @@ jobs:
 
       - name: Store reports
         if: steps.gradle-build.outcome == 'success' || steps.gradle-build.outcome == 'failure'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: gradle-${{ matrix.gradle }}-tests
           path: build/reports/tests/test/
@@ -83,9 +87,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: |
+            ${{ matrix.java }}
+            8
+
       - name: Setup environment
         run: |
-          echo "JAVA_HOME=${JAVA_HOME_8_X64}" | tee -a $GITHUB_ENV
           echo "org.gradle.java.installations.auto-download=false" | tee -a gradle.properties
           echo "org.gradle.java.installations.fromEnv=JAVA_HOME_${{ matrix.java }}_X64" | tee -a gradle.properties
 
@@ -101,7 +111,7 @@ jobs:
 
       - name: Store reports
         if: steps.gradle-build.outcome == 'success' || steps.gradle-build.outcome == 'failure'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: jdk-${{ matrix.java }}-tests
           path: build/reports/tests/test/
@@ -113,11 +123,17 @@ jobs:
       matrix:
         gradle: [ '7.5', '7.4.2', '7.3.3', '7.2' ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: |
+            17
+            8
 
       - name: Setup environment
         run: |
-          echo "JAVA_HOME=${JAVA_HOME_8_X64}" | tee -a $GITHUB_ENV
           echo "org.gradle.java.installations.auto-download=false" | tee -a gradle.properties
           echo "org.gradle.java.installations.fromEnv=JAVA_HOME_17_X64" | tee -a gradle.properties
 
@@ -133,7 +149,7 @@ jobs:
 
       - name: Store reports
         if: always() && (steps.gradle-build.outcome == 'success' || steps.gradle-build.outcome == 'failure')
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: jdk17-gradle-${{ matrix.gradle }}-tests
           path: build/reports/tests/test/