Skip to content

Commit 27abe97

Browse files
committed
UseShenandoahGC
1 parent 3c1a5c8 commit 27abe97

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ jobs:
2626
build:
2727
name: Build and Test
2828
strategy:
29+
fail-fast: false
2930
matrix:
3031
os: [ubuntu-latest]
3132
scala: [2.12, 2.13, 3]
32-
java: [corretto@11]
33+
java: [temurin@11]
3334
project: [rootJS, rootJVM, rootNative]
3435
exclude:
3536
- scala: 3
@@ -42,17 +43,17 @@ jobs:
4243
with:
4344
fetch-depth: 0
4445

45-
- name: Setup Java (corretto@11)
46-
id: setup-java-corretto-11
47-
if: matrix.java == 'corretto@11'
46+
- name: Setup Java (temurin@11)
47+
id: setup-java-temurin-11
48+
if: matrix.java == 'temurin@11'
4849
uses: actions/setup-java@v4
4950
with:
50-
distribution: corretto
51+
distribution: temurin
5152
java-version: 11
5253
cache: sbt
5354

5455
- name: sbt update
55-
if: matrix.java == 'corretto@11' && steps.setup-java-corretto-11.outputs.cache-hit == 'false'
56+
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
5657
run: ./sbt +update
5758

5859
- name: Check that workflows are up to date
@@ -70,11 +71,11 @@ jobs:
7071
run: ./sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
7172

7273
- name: Check binary compatibility
73-
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-latest'
74+
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest'
7475
run: ./sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
7576

7677
- name: Generate API documentation
77-
if: matrix.java == 'corretto@11' && matrix.os == 'ubuntu-latest'
78+
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest'
7879
run: ./sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
7980

8081
- name: Make target directories
@@ -99,25 +100,25 @@ jobs:
99100
strategy:
100101
matrix:
101102
os: [ubuntu-latest]
102-
java: [corretto@11]
103+
java: [temurin@11]
103104
runs-on: ${{ matrix.os }}
104105
steps:
105106
- name: Checkout current branch (full)
106107
uses: actions/checkout@v4
107108
with:
108109
fetch-depth: 0
109110

110-
- name: Setup Java (corretto@11)
111-
id: setup-java-corretto-11
112-
if: matrix.java == 'corretto@11'
111+
- name: Setup Java (temurin@11)
112+
id: setup-java-temurin-11
113+
if: matrix.java == 'temurin@11'
113114
uses: actions/setup-java@v4
114115
with:
115-
distribution: corretto
116+
distribution: temurin
116117
java-version: 11
117118
cache: sbt
118119

119120
- name: sbt update
120-
if: matrix.java == 'corretto@11' && steps.setup-java-corretto-11.outputs.cache-hit == 'false'
121+
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
121122
run: ./sbt +update
122123

123124
- name: Download target directories (2.12, rootJS)
@@ -230,25 +231,25 @@ jobs:
230231
strategy:
231232
matrix:
232233
os: [ubuntu-latest]
233-
java: [corretto@11]
234+
java: [temurin@11]
234235
runs-on: ${{ matrix.os }}
235236
steps:
236237
- name: Checkout current branch (full)
237238
uses: actions/checkout@v4
238239
with:
239240
fetch-depth: 0
240241

241-
- name: Setup Java (corretto@11)
242-
id: setup-java-corretto-11
243-
if: matrix.java == 'corretto@11'
242+
- name: Setup Java (temurin@11)
243+
id: setup-java-temurin-11
244+
if: matrix.java == 'temurin@11'
244245
uses: actions/setup-java@v4
245246
with:
246-
distribution: corretto
247+
distribution: temurin
247248
java-version: 11
248249
cache: sbt
249250

250251
- name: sbt update
251-
if: matrix.java == 'corretto@11' && steps.setup-java-corretto-11.outputs.cache-hit == 'false'
252+
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
252253
run: ./sbt +update
253254

254255
- name: Submit Dependencies

.jvmopts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
-Xmx4g
2-
-XX:+UseG1GC
2+
-XX:+UseShenandoahGC
33
-Dfile.encoding=UTF8

build.sbt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ ThisBuild / crossScalaVersions := Seq("2.12.17", scala213, scala3)
55

66
ThisBuild / tlBaseVersion := "2.5"
77

8-
val javaDistro = JavaSpec.corretto("11")
8+
ThisBuild / githubWorkflowBuildMatrixFailFast := Some(false)
9+
10+
val javaDistro = JavaSpec.temurin("11")
911
ThisBuild / githubWorkflowJavaVersions := Seq(javaDistro)
1012

1113
ThisBuild / githubWorkflowSbtCommand := "./sbt"

0 commit comments

Comments
 (0)