Skip to content

Commit 4645093

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

File tree

2 files changed

+16
-30
lines changed

2 files changed

+16
-30
lines changed

.github/workflows/language-reference.yaml

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

33-
- name: Cache Coursier
34-
uses: actions/cache@v1
35-
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') }}
33+
- name: Cache coursier and sbt
34+
- uses: coursier/cache-action@v6
4435

45-
- name: Set up JDK 11
46-
uses: actions/setup-java@v1
36+
- name: Set up JDK 17
37+
uses: actions/setup-java@v3
4738
with:
48-
java-version: 11
39+
distribution: 'temurin'
40+
java-version: 17
4941

5042
- name: Generate reference documentation and test links
5143
run: |

.github/workflows/scaladoc.yaml

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

29-
- name: Cache Coursier
30-
uses: actions/cache@v1
31-
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') }}
29+
- name: Cache coursier and sbt
30+
- uses: coursier/cache-action@v6
3931

40-
- name: Set up JDK 11
41-
uses: actions/setup-java@v1
32+
- name: Set up JDK 17
33+
uses: actions/setup-java@v3
4234
with:
43-
java-version: 11
35+
distribution: 'temurin'
36+
java-version: 17
4437

4538
- name: Compile and test scala3doc-js
4639
run: ./project/scripts/sbt scaladoc-js-main/test
@@ -98,10 +91,11 @@ jobs:
9891
- name: Git Checkout
9992
uses: actions/checkout@v3
10093

101-
- name: Set up JDK 8
102-
uses: actions/setup-java@v1
94+
- name: Set up JDK 17
95+
uses: actions/setup-java@v3
10396
with:
104-
java-version: 8
97+
distribution: 'temurin'
98+
java-version: 17
10599

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

0 commit comments

Comments
 (0)