From 6be4051f9e40bdb2ecb6721584249ab4add1de41 Mon Sep 17 00:00:00 2001
From: John Niang <johnniang@riseup.net>
Date: Sun, 31 Oct 2021 21:48:53 +0800
Subject: [PATCH] Simplify Java setup in GitHub workflow (#1509)

Signed-off-by: John Niang <johnniang@fastmail.com>
---
 .github/workflows/halo.yml | 61 ++++++--------------------------------
 1 file changed, 9 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/halo.yml b/.github/workflows/halo.yml
index 5af3c4621..6a933981b 100644
--- a/.github/workflows/halo.yml
+++ b/.github/workflows/halo.yml
@@ -24,28 +24,11 @@ jobs:
         with:
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'temurin'
+          cache: 'gradle'
           java-version: 11
-
-      - name: Cache Gradle wrapper
-        id: cache-gradle-wrapper
-        uses: actions/cache@v2.1.3
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-dependencies-
-
-      - name: Cache Dependencies
-        id: cache-dependencies
-        uses: actions/cache@v2.1.3
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-dependencies-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-dependencies-
-
       - name: Check And Test
         run: ./gradlew check
   build:
@@ -58,26 +41,11 @@ jobs:
         with:
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'temurin'
+          cache: 'gradle'
           java-version: 11
-      - name: Cache Gradle wrapper
-        id: cache-gradle-wrapper
-        uses: actions/cache@v2.1.3
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-dependencies-
-      - name: Cache Dependencies
-        id: cache-dependencies
-        uses: actions/cache@v2.1.3
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-dependencies-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-dependencies-
-
       - name: Build with Gradle
         run: ./gradlew clean build -x test
 
@@ -142,22 +110,11 @@ jobs:
         with:
           submodules: true
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'temurin'
+          cache: 'gradle'
           java-version: 11
-      - name: Download halo jar
-        uses: actions/download-artifact@v2
-        with:
-          name: halo-jar
-          path: build/libs
-      - name: Cache Gradle wrapper
-        id: cache-gradle-wrapper
-        uses: actions/cache@v2.1.3
-        with:
-          path: ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-dependencies-
       - name: Get version of halo
         id: get_halo_version
         run: |