Skip to content

Commit 336045e

Browse files
kevin-leekevin-lee
committed
Update GitHub Actions: Replace olafurpg/setup-scala with actions/setup-java and sbt/setup-sbt
1 parent 849940f commit 336045e

File tree

3 files changed

+33
-79
lines changed

3 files changed

+33
-79
lines changed

‎.github/workflows/build.yml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,18 @@ jobs:
1515
strategy:
1616
matrix:
1717
scala:
18-
- { name: "Scala 2", version: "2.12.18", binary-version: "2.12", java-version: "adopt@1.11", params: "" }
19-
- { name: "Scala 2", version: "2.13.12", binary-version: "2.13", java-version: "adopt@1.11", params: "" }
20-
- { name: "Scala 3.1", version: "3.3.1", binary-version: "3", java-version: "adopt@1.11", params: '' }
18+
- { name: "Scala 2", version: "2.12.18", binary-version: "2.12", java-version: "11", java-distribution: "temurin", params: "" }
19+
- { name: "Scala 2", version: "2.13.12", binary-version: "2.13", java-version: "11", java-distribution: "temurin", params: "" }
20+
- { name: "Scala 3.1", version: "3.3.1", binary-version: "3", java-version: "11", java-distribution: "temurin", params: '' }
2121

2222
steps:
2323
- uses: actions/checkout@v4
24-
- uses: olafurpg/setup-scala@v14
24+
- uses: actions/setup-java@v4
2525
with:
2626
java-version: ${{ matrix.scala.java-version }}
27-
28-
- name: Cache SBT
29-
uses: actions/cache@v4
30-
with:
31-
path: |
32-
~/.ivy2/cache
33-
~/.cache/coursier
34-
~/.sbt
35-
key: ${{ runner.os }}-sbt-${{ matrix.scala.binary-version }}-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
36-
restore-keys: |
37-
${{ runner.os }}-sbt-${{ matrix.scala.binary-version }}
27+
distribution: ${{ matrix.scala.java-distribution }}
28+
cache: 'sbt'
29+
- uses: sbt/setup-sbt@v1
3830

3931
- name: "[Push] Build All for Scala ${{ matrix.scala.version }}"
4032
if: github.event_name == 'push'

‎.github/workflows/coverage.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,8 @@ jobs:
2929
with:
3030
java-version: ${{ matrix.scala.java-version }}
3131
distribution: ${{ matrix.scala.java-distribution }}
32-
33-
- name: Cache SBT
34-
uses: actions/cache@v4
35-
with:
36-
path: |
37-
~/.ivy2/cache
38-
~/.cache/coursier
39-
~/.sbt
40-
key: ${{ runner.os }}-sbt-${{ matrix.scala.binary-version }}-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
41-
restore-keys: |
42-
${{ runner.os }}-sbt-${{ matrix.scala.binary-version }}-
32+
cache: 'sbt'
33+
- uses: sbt/setup-sbt@v1
4334

4435
- name: "[Codecov] Report ${{ matrix.scala.name }} ${{ matrix.scala.version }} - ${{ github.run_number }}"
4536
if: ${{ matrix.scala.report == 'report' && github.event_name == 'push' }}

‎.github/workflows/release.yml

Lines changed: 24 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ on:
88
- '*'
99

1010
env:
11-
GH_JAVA_VERSION: "adopt@1.11"
11+
GH_JAVA_VERSION: "11"
12+
GH_JAVA_DISTRIBUTION: "temurin"
1213
GH_JVM_OPTS: "-Xss64m -Xms1024m -XX:MaxMetaspaceSize=1G -Xmx2G -XX:MaxInlineLevel=18 -XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler"
1314

1415
jobs:
@@ -19,26 +20,18 @@ jobs:
1920
strategy:
2021
matrix:
2122
scala:
22-
- { name: "Scala 2", version: "2.12.18", binary-version: "2.12", java-version: "adopt@1.11", params: "" }
23-
- { name: "Scala 2", version: "2.13.12", binary-version: "2.13", java-version: "adopt@1.11", params: "" }
24-
- { name: "Scala 3.1", version: "3.3.1", binary-version: "3", java-version: "adopt@1.11", params: '' }
23+
- { name: "Scala 2", version: "2.12.18", binary-version: "2.12", java-version: "11", java-distribution: "temurin", params: "" }
24+
- { name: "Scala 2", version: "2.13.12", binary-version: "2.13", java-version: "11", java-distribution: "temurin", params: "" }
25+
- { name: "Scala 3.1", version: "3.3.1", binary-version: "3", java-version: "11", java-distribution: "temurin", params: '' }
2526

2627
steps:
2728
- uses: actions/checkout@v4
28-
- uses: olafurpg/setup-scala@v14
29+
- uses: actions/setup-java@v4
2930
with:
3031
java-version: ${{ matrix.scala.java-version }}
31-
32-
- name: Cache SBT
33-
uses: actions/cache@v4
34-
with:
35-
path: |
36-
~/.ivy2/cache
37-
~/.cache/coursier
38-
~/.sbt
39-
key: ${{ runner.os }}-sbt-${{ matrix.scala.binary-version }}-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
40-
restore-keys: |
41-
${{ runner.os }}-sbt-${{ matrix.scala.binary-version }}
32+
distribution: ${{ matrix.scala.java-distribution }}
33+
cache: 'sbt'
34+
- uses: sbt/setup-sbt@v1
4235

4336
- name: "Build All for Scala ${{ matrix.scala.version }}"
4437
env:
@@ -53,24 +46,16 @@ jobs:
5346
strategy:
5447
matrix:
5548
scala:
56-
- { name: "Scala 2", version: "2.13.12", binary-version: "2.13", java-version: "adopt@1.11" }
49+
- { name: "Scala 2", version: "2.13.12", binary-version: "2.13", java-version: "11", java-distribution: "temurin" }
5750

5851
steps:
5952
- uses: actions/checkout@v4
60-
- uses: olafurpg/setup-scala@v14
53+
- uses: actions/setup-java@v4
6154
with:
6255
java-version: ${{ matrix.scala.java-version }}
63-
64-
- name: Cache SBT
65-
uses: actions/cache@v4
66-
with:
67-
path: |
68-
~/.ivy2/cache
69-
~/.cache/coursier
70-
~/.sbt
71-
key: ${{ runner.os }}-sbt-${{ matrix.scala.binary-version }}-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
72-
restore-keys: |
73-
${{ runner.os }}-sbt-${{ matrix.scala.binary-version }}-
56+
distribution: ${{ matrix.scala.java-distribution }}
57+
cache: 'sbt'
58+
- uses: sbt/setup-sbt@v1
7459

7560
- name: "[Codecov] Report ${{ matrix.scala.name }} ${{ matrix.scala.version }} - ${{ github.run_number }}"
7661
env:
@@ -95,20 +80,14 @@ jobs:
9580
runs-on: ubuntu-latest
9681
steps:
9782
- uses: actions/checkout@v4
98-
- uses: olafurpg/setup-scala@v14
9983
with:
100-
java-version: ${{ env.GH_JAVA_VERSION }}
101-
102-
- name: Cache SBT
103-
uses: actions/cache@v4
84+
fetch-depth: 0
85+
- uses: actions/setup-java@v4
10486
with:
105-
path: |
106-
~/.ivy2/cache
107-
~/.cache/coursier
108-
~/.sbt
109-
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
110-
restore-keys: |
111-
${{ runner.os }}-sbt
87+
java-version: ${{ env.GH_JAVA_VERSION }}
88+
distribution: ${{ env.GH_JAVA_DISTRIBUTION }}
89+
cache: 'sbt'
90+
- uses: sbt/setup-sbt@v1
11291

11392
- name: sbt GitHub Release
11493
env:
@@ -135,22 +114,14 @@ jobs:
135114
- uses: actions/checkout@v4
136115
with:
137116
fetch-depth: 0
138-
- uses: olafurpg/setup-scala@v14
117+
- uses: actions/setup-java@v4
139118
with:
140119
java-version: ${{ env.GH_JAVA_VERSION }}
120+
distribution: ${{ env.GH_JAVA_DISTRIBUTION }}
121+
cache: 'sbt'
122+
- uses: sbt/setup-sbt@v1
141123
- uses: olafurpg/setup-gpg@v3
142124

143-
- name: Cache SBT
144-
uses: actions/cache@v4
145-
with:
146-
path: |
147-
~/.ivy2/cache
148-
~/.cache/coursier
149-
~/.sbt
150-
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
151-
restore-keys: |
152-
${{ runner.os }}-sbt
153-
154125
- name: "sbt ci-release - ${{ github.run_number }}"
155126
env:
156127
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}

0 commit comments

Comments
 (0)