chore(ci): update setup-java GHA to v2 (#867)

closes: spinnaker/spinnaker#6611
spinnaker · Feb 22, 2022 · f9b4da7 · f9b4da7
1 parent f249e1f
commit f9b4da7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 37 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,14 +18,10 @@ jobs:
       - uses: actions/checkout@v2
       - name: Gradle validation step
         uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
           java-version: 11
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          distribution: 'zulu'
+          cache: 'gradle'
       - name: Build
         run: ./gradlew build --stacktrace
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,15 +13,11 @@ jobs:
     - uses: actions/checkout@v2
     - name: Gradle validation step
       uses: gradle/wrapper-validation-action@v1
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v2
       with:
         java-version: 11
-    - uses: actions/cache@v1
-      with:
-        path: ~/.gradle
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
+        distribution: 'zulu'
+        cache: 'gradle'
     - name: Build and Functional tests
       run: ./gradlew build $GRADLE_ARGS
 
@@ -43,16 +39,11 @@ jobs:
         uses: gradle/wrapper-validation-action@v1
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: 11
-
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          distribution: 'zulu'
+          cache: 'gradle'
 
       - name: Run Integration Test
         run: |
@@ -76,16 +67,11 @@ jobs:
         uses: gradle/wrapper-validation-action@v1
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: 11
-
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          distribution: 'zulu'
+          cache: 'gradle'
 
       - name: Run Provider Integration Test
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,15 +17,11 @@ jobs:
       - run: git fetch --prune --unshallow
       - name: Gradle validation step
         uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
           java-version: 11
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          distribution: 'zulu'
+          cache: 'gradle'
       - name: Assemble release info
         id: release_info
         env: