ci: switch to setup-java@v2 cache for Gradle

SAP · Oct 4, 2021 · 3b6bb5d · 3b6bb5d
1 parent f551fb1
commit 3b6bb5d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 34 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -18,19 +18,11 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: "11.0.2"
-
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          distribution: 'temurin'
+          java-version: '11.0'
+          cache: 'gradle'
 
       - name: Get new version
         id: getVersion
@@ -62,19 +54,11 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: "11.0.2"
-
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
+        uses: actions/setup-java@v2
         with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          distribution: 'temurin'
+          java-version: '11.0'
+          cache: 'gradle'
 
       - name: Tag release commit
         run: |

diff --git a/.github/workflows/voter.yml b/.github/workflows/voter.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        java: ['11.0.2']
+        java: ['11.0']
         platform: [ubuntu-18.04] # macOS-latest, windows-latest
 
     steps:
@@ -26,24 +26,19 @@ jobs:
         fetch-depth: 0
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
+        distribution: 'temurin'
         java-version: ${{ matrix.java }}
+        cache: 'gradle'
 
     - name: Cache SonarCloud packages
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: ~/.sonar/cache
         key: ${{ runner.os }}-sonar
         restore-keys: ${{ runner.os }}-sonar
 
-    - name: Cache Gradle packages
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle
-
     - name: Build and analyze
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}