Skip to content

Commit 351ce57

Browse files
committed
Fix community-build tests
1 parent d2da16c commit 351ce57

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

.github/workflows/ci.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,10 @@ jobs:
200200
)"
201201

202202
steps:
203-
##############################################################################################
203+
############################################################################################################
204204
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA 3.8.0+ IS DISTRIBUTED USING JAVA 17. ##
205-
##############################################################################################
206-
- name: Set JDK 17 as default
205+
############################################################################################################
206+
- name: Set JDK 17 as default # some projects depend on javalib elements removed in newer versions
207207
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
208208
- name: Reset existing repo
209209
run: |
@@ -257,10 +257,10 @@ jobs:
257257
)"
258258

259259
steps:
260-
##############################################################################################
260+
############################################################################################################
261261
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA 3.8.0+ IS DISTRIBUTED USING JAVA 17. ##
262-
##############################################################################################
263-
- name: Set JDK 17 as default
262+
############################################################################################################
263+
- name: Set JDK 17 as default # some projects depend on javalib elements removed in newer versions
264264
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
265265
- name: Reset existing repo
266266
run: |
@@ -314,9 +314,9 @@ jobs:
314314
)"
315315

316316
steps:
317-
##############################################################################################
317+
############################################################################################################
318318
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA 3.8.0+ IS DISTRIBUTED USING JAVA 17. ##
319-
##############################################################################################
319+
############################################################################################################
320320
- name: Set JDK 17 as default
321321
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
322322
- name: Reset existing repo

community-build/src/scala/dotty/communitybuild/projects.scala

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,12 @@ object projects:
544544

545545
lazy val scissLucre = SbtCommunityProject(
546546
project = "Lucre",
547-
sbtTestCommand = "adjunctJVM/test;baseJVM/test;confluentJVM/test;coreJVM/test;dataJVM/test;exprJVM/test;geomJVM/test;lucre-bdb/test;testsJVM/test",
547+
sbtTestCommand =
548+
val subprojects = List("adjunct.jvm", "base.jvm", "confluent.jvm", "core.jvm", "data.jvm", "expr.jvm", "geom.jvm", "bdb", "tests.jvm")
549+
List(
550+
subprojects.map(name => s"""set ($name/Compile/compile/scalacOptions) := ($name/Compile/compile/scalacOptions).value.filterNot(opt => opt == "-release" || opt == "8")"""),
551+
List("adjunctJVM/test;baseJVM/test;confluentJVM/test;coreJVM/test;dataJVM/test;exprJVM/test;geomJVM/test;lucre-bdb/test;testsJVM/test")
552+
).flatten.mkString("; "),
548553
extraSbtArgs = List("-Dde.sciss.lucre.ShortTests=true"),
549554
sbtPublishCommand = "adjunctJVM/publishLocal;baseJVM/publishLocal;confluentJVM/publishLocal;coreJVM/publishLocal;dataJVM/publishLocal;exprJVM/publishLocal;geomJVM/publishLocal;lucre-bdb/publishLocal",
550555
)
@@ -615,7 +620,12 @@ object projects:
615620

616621
lazy val fs2 = SbtCommunityProject(
617622
project = "fs2",
618-
sbtTestCommand = "coreJVM/test; coreJS/test", // io/test requires JDK9+
623+
sbtTestCommand =
624+
val subprojects = List("coreJVM", "coreJS")
625+
List(
626+
subprojects.map(name => s"""set $name/Compile/scalacOptions := ($name/Compile/scalacOptions).value.filterNot(opt => opt == "-release" || opt == "8")"""),
627+
List("coreJVM/test; coreJS/test;")
628+
).flatten.mkString("; "),
619629
sbtPublishCommand = "coreJVM/publishLocal; coreJS/publishLocal",
620630
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Wsafe-init"),
621631
)

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ end CommunityBuildTestB
5858
@Category(Array(classOf[TestCategory]))
5959
class CommunityBuildTestC:
6060
@Test def akka = projects.akka.run()
61-
@Test def betterfiles = projects.betterfiles.run()
61+
// Disabled because `javax.xml.bind` is not available since java 11
62+
// @Test def betterfiles = projects.betterfiles.run()
6263
@Test def cask = projects.cask.run()
6364
// Temporarily disabled until problem discovered in comments to #9449 is fixed
6465
// @Test def dottyCpsAsync = projects.dottyCpsAsync.run()
@@ -75,7 +76,8 @@ class CommunityBuildTestC:
7576
@Test def oslib = projects.oslib.run()
7677
// @Test def oslibWatch = projects.oslibWatch.run()
7778
@Test def parboiled2 = projects.parboiled2.run()
78-
@Test def playJson = projects.playJson.run()
79+
// Disabled because `javax.xml.bind` is not available since java 11
80+
// @Test def playJson = projects.playJson.run()
7981
@Test def pprint = projects.pprint.run()
8082
//@Test def protoquill = projects.protoquill.run()
8183
@Test def requests = projects.requests.run()

0 commit comments

Comments
 (0)