Skip to content

Commit 9bb3d89

Browse files
committed
revert java 11 change
1 parent 535e343 commit 9bb3d89

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,22 @@ jobs:
2424
matrix:
2525
os: [ubuntu-latest]
2626
scala: [2.11.12, 2.12.20, 2.13.16, 3.3.5]
27-
java: [zulu@11, zulu@17, zulu@21]
27+
java: [zulu@8, zulu@11, zulu@17, zulu@21]
2828
runs-on: ${{ matrix.os }}
2929
steps:
3030
- name: Checkout current branch (full)
3131
uses: actions/checkout@v4
3232
with:
3333
fetch-depth: 0
3434

35+
- name: Setup Java (zulu@8)
36+
if: matrix.java == 'zulu@8'
37+
uses: actions/setup-java@v4
38+
with:
39+
distribution: zulu
40+
java-version: 8
41+
cache: sbt
42+
3543
- name: Setup Java (zulu@11)
3644
if: matrix.java == 'zulu@11'
3745
uses: actions/setup-java@v4
@@ -81,14 +89,22 @@ jobs:
8189
matrix:
8290
os: [ubuntu-latest]
8391
scala: [2.13.16]
84-
java: [zulu@11]
92+
java: [zulu@8]
8593
runs-on: ${{ matrix.os }}
8694
steps:
8795
- name: Checkout current branch (full)
8896
uses: actions/checkout@v4
8997
with:
9098
fetch-depth: 0
9199

100+
- name: Setup Java (zulu@8)
101+
if: matrix.java == 'zulu@8'
102+
uses: actions/setup-java@v4
103+
with:
104+
distribution: zulu
105+
java-version: 8
106+
cache: sbt
107+
92108
- name: Setup Java (zulu@11)
93109
if: matrix.java == 'zulu@11'
94110
uses: actions/setup-java@v4

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Compile / resourceGenerators += Def.task {
165165
Test / parallelExecution := false
166166

167167
ThisBuild / githubWorkflowSbtCommand := "sbt -J-Xmx2G"
168-
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Zulu, "11"),
168+
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Zulu, "8"), JavaSpec(Zulu, "11"),
169169
JavaSpec(Zulu, "17"), JavaSpec(Zulu, "21"))
170170
ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "mimaReportBinaryIssues")))
171171
ThisBuild / githubWorkflowTargetBranches := Seq("2.*")

0 commit comments

Comments
 (0)