From e3ad50834446a1fdd2b3a569fbcf6c6b5477a86a Mon Sep 17 00:00:00 2001
From: Chris Kipp <ckipp@pm.me>
Date: Thu, 28 Jul 2022 10:55:41 +0200
Subject: [PATCH] chore(ci): update ci to newest checkout java and simplify
 caching

---
 .github/workflows/language-reference.yaml | 20 +++++------------
 .github/workflows/scaladoc.yaml           | 26 ++++++++---------------
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/language-reference.yaml b/.github/workflows/language-reference.yaml
index 58025c7e7993..a661df490a3b 100644
--- a/.github/workflows/language-reference.yaml
+++ b/.github/workflows/language-reference.yaml
@@ -30,22 +30,12 @@ jobs:
           fetch-depth: 0
           ssh-key: ${{ secrets.DOCS_KEY }}
 
-      - name: Cache Coursier
-        uses: actions/cache@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          path: ~/.cache/coursier
-          key: sbt-coursier-cache
-
-      - name: Cache SBT
-        uses: actions/cache@v1
-        with:
-          path: ~/.sbt
-          key: sbt-${{ hashFiles('**/build.sbt') }}
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'sbt'
 
       - name: Generate reference documentation and test links
         run: |
diff --git a/.github/workflows/scaladoc.yaml b/.github/workflows/scaladoc.yaml
index 83837f890bcc..9ccbe34788ce 100644
--- a/.github/workflows/scaladoc.yaml
+++ b/.github/workflows/scaladoc.yaml
@@ -26,21 +26,12 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@v3
 
-      - name: Cache Coursier
-        uses: actions/cache@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          path: ~/.cache/coursier
-          key: sbt-coursier-cache
-      - name: Cache SBT
-        uses: actions/cache@v1
-        with:
-          path: ~/.sbt
-          key: sbt-${{ hashFiles('**/build.sbt') }}
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'sbt'
 
       - name: Compile and test scala3doc-js
         run: ./project/scripts/sbt scaladoc-js-main/test
@@ -98,10 +89,11 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@v3
 
-      - name: Set up JDK 8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 8
+          distribution: 'temurin'
+          java-version: 17
 
       - name: Test sourcelinks to stdlib
         run: true # ./project/scripts/sbt scaladoc/sourceLinksIntegrationTest:test