Skip to content

Commit e3ad508

Browse files
committed
chore(ci): update ci to newest checkout java and simplify caching
1 parent 5b94704 commit e3ad508

File tree

2 files changed

+14
-32
lines changed

2 files changed

+14
-32
lines changed

.github/workflows/language-reference.yaml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,12 @@ jobs:
3030
fetch-depth: 0
3131
ssh-key: ${{ secrets.DOCS_KEY }}
3232

33-
- name: Cache Coursier
34-
uses: actions/cache@v1
33+
- name: Set up JDK 17
34+
uses: actions/setup-java@v3
3535
with:
36-
path: ~/.cache/coursier
37-
key: sbt-coursier-cache
38-
39-
- name: Cache SBT
40-
uses: actions/cache@v1
41-
with:
42-
path: ~/.sbt
43-
key: sbt-${{ hashFiles('**/build.sbt') }}
44-
45-
- name: Set up JDK 11
46-
uses: actions/setup-java@v1
47-
with:
48-
java-version: 11
36+
distribution: 'temurin'
37+
java-version: 17
38+
cache: 'sbt'
4939

5040
- name: Generate reference documentation and test links
5141
run: |

.github/workflows/scaladoc.yaml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,12 @@ jobs:
2626
- name: Git Checkout
2727
uses: actions/checkout@v3
2828

29-
- name: Cache Coursier
30-
uses: actions/cache@v1
29+
- name: Set up JDK 17
30+
uses: actions/setup-java@v3
3131
with:
32-
path: ~/.cache/coursier
33-
key: sbt-coursier-cache
34-
- name: Cache SBT
35-
uses: actions/cache@v1
36-
with:
37-
path: ~/.sbt
38-
key: sbt-${{ hashFiles('**/build.sbt') }}
39-
40-
- name: Set up JDK 11
41-
uses: actions/setup-java@v1
42-
with:
43-
java-version: 11
32+
distribution: 'temurin'
33+
java-version: 17
34+
cache: 'sbt'
4435

4536
- name: Compile and test scala3doc-js
4637
run: ./project/scripts/sbt scaladoc-js-main/test
@@ -98,10 +89,11 @@ jobs:
9889
- name: Git Checkout
9990
uses: actions/checkout@v3
10091

101-
- name: Set up JDK 8
102-
uses: actions/setup-java@v1
92+
- name: Set up JDK 17
93+
uses: actions/setup-java@v3
10394
with:
104-
java-version: 8
95+
distribution: 'temurin'
96+
java-version: 17
10597

10698
- name: Test sourcelinks to stdlib
10799
run: true # ./project/scripts/sbt scaladoc/sourceLinksIntegrationTest:test

0 commit comments

Comments
 (0)