From da65b32d708a8fd245e629d8c44d55785de499c0 Mon Sep 17 00:00:00 2001 From: Hanns Holger Rutz Date: Mon, 7 Dec 2020 13:53:32 +0100 Subject: [PATCH 1/3] Add 'Sciss/Lucre' to Community Build --- .gitmodules | 33 +++++++++ community-build/community-projects/AsyncFile | 1 + community-build/community-projects/Equal | 1 + community-build/community-projects/FingerTree | 1 + community-build/community-projects/Log | 1 + community-build/community-projects/Lucre | 1 + community-build/community-projects/Model | 1 + community-build/community-projects/Numbers | 1 + community-build/community-projects/Serial | 1 + community-build/community-projects/Span | 1 + community-build/community-projects/scala-stm | 1 + .../community-projects/scalatestplus-junit | 1 + .../scala/dotty/communitybuild/projects.scala | 73 +++++++++++++++++++ .../communitybuild/CommunityBuildTest.scala | 13 ++++ 14 files changed, 130 insertions(+) create mode 160000 community-build/community-projects/AsyncFile create mode 160000 community-build/community-projects/Equal create mode 160000 community-build/community-projects/FingerTree create mode 160000 community-build/community-projects/Log create mode 160000 community-build/community-projects/Lucre create mode 160000 community-build/community-projects/Model create mode 160000 community-build/community-projects/Numbers create mode 160000 community-build/community-projects/Serial create mode 160000 community-build/community-projects/Span create mode 160000 community-build/community-projects/scala-stm create mode 160000 community-build/community-projects/scalatestplus-junit diff --git a/.gitmodules b/.gitmodules index 9f0390e42408..1d54c5c6d6a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -141,3 +141,36 @@ [submodule "community-build/community-projects/coop"] path = community-build/community-projects/coop url = https://github.com/dotty-staging/coop.git +[submodule "community-build/community-projects/AsyncFile"] + path = community-build/community-projects/AsyncFile + url = https://github.com/dotty-staging/AsyncFile.git +[submodule "community-build/community-projects/Equal"] + path = community-build/community-projects/Equal + url = https://github.com/dotty-staging/Equal.git +[submodule "community-build/community-projects/FingerTree"] + path = community-build/community-projects/FingerTree + url = https://github.com/dotty-staging/FingerTree.git +[submodule "community-build/community-projects/Log"] + path = community-build/community-projects/Log + url = https://github.com/dotty-staging/Log.git +[submodule "community-build/community-projects/Model"] + path = community-build/community-projects/Model + url = https://github.com/dotty-staging/Model.git +[submodule "community-build/community-projects/Numbers"] + path = community-build/community-projects/Numbers + url = https://github.com/dotty-staging/Numbers.git +[submodule "community-build/community-projects/Serial"] + path = community-build/community-projects/Serial + url = https://github.com/dotty-staging/Serial.git +[submodule "community-build/community-projects/Span"] + path = community-build/community-projects/Span + url = https://github.com/dotty-staging/Span.git +[submodule "community-build/community-projects/Lucre"] + path = community-build/community-projects/Lucre + url = https://github.com/dotty-staging/Lucre.git +[submodule "community-build/community-projects/scala-stm"] + path = community-build/community-projects/scala-stm + url = https://github.com/dotty-staging/scala-stm.git +[submodule "community-build/community-projects/scalatestplus-junit"] + path = community-build/community-projects/scalatestplus-junit + url = https://github.com/dotty-staging/scalatestplus-junit.git diff --git a/community-build/community-projects/AsyncFile b/community-build/community-projects/AsyncFile new file mode 160000 index 000000000000..fe33563b74e1 --- /dev/null +++ b/community-build/community-projects/AsyncFile @@ -0,0 +1 @@ +Subproject commit fe33563b74e1e1df333e86bb04b728feb199eecd diff --git a/community-build/community-projects/Equal b/community-build/community-projects/Equal new file mode 160000 index 000000000000..f42b05026591 --- /dev/null +++ b/community-build/community-projects/Equal @@ -0,0 +1 @@ +Subproject commit f42b05026591e146d9b4cfdd6418383321a76cd4 diff --git a/community-build/community-projects/FingerTree b/community-build/community-projects/FingerTree new file mode 160000 index 000000000000..42b27e008e6f --- /dev/null +++ b/community-build/community-projects/FingerTree @@ -0,0 +1 @@ +Subproject commit 42b27e008e6f8095a928cbbef8efb4c644e46289 diff --git a/community-build/community-projects/Log b/community-build/community-projects/Log new file mode 160000 index 000000000000..02b59d0df788 --- /dev/null +++ b/community-build/community-projects/Log @@ -0,0 +1 @@ +Subproject commit 02b59d0df788fdbdf602ba7fdd40c63c7aca885f diff --git a/community-build/community-projects/Lucre b/community-build/community-projects/Lucre new file mode 160000 index 000000000000..ebbc12c4af12 --- /dev/null +++ b/community-build/community-projects/Lucre @@ -0,0 +1 @@ +Subproject commit ebbc12c4af12b07d6b9e8fc63306f6ce559b5a38 diff --git a/community-build/community-projects/Model b/community-build/community-projects/Model new file mode 160000 index 000000000000..0704fa394b39 --- /dev/null +++ b/community-build/community-projects/Model @@ -0,0 +1 @@ +Subproject commit 0704fa394b39fc80c6292e67561c0884f50fabf7 diff --git a/community-build/community-projects/Numbers b/community-build/community-projects/Numbers new file mode 160000 index 000000000000..971a6755c677 --- /dev/null +++ b/community-build/community-projects/Numbers @@ -0,0 +1 @@ +Subproject commit 971a6755c677245678fd97652f9931910b797218 diff --git a/community-build/community-projects/Serial b/community-build/community-projects/Serial new file mode 160000 index 000000000000..0a3a39772f6d --- /dev/null +++ b/community-build/community-projects/Serial @@ -0,0 +1 @@ +Subproject commit 0a3a39772f6df3fac495f203c8d582d29c72124b diff --git a/community-build/community-projects/Span b/community-build/community-projects/Span new file mode 160000 index 000000000000..8674590a836c --- /dev/null +++ b/community-build/community-projects/Span @@ -0,0 +1 @@ +Subproject commit 8674590a836cb227284eef08a307dbbdb9140f15 diff --git a/community-build/community-projects/scala-stm b/community-build/community-projects/scala-stm new file mode 160000 index 000000000000..e25579f586a9 --- /dev/null +++ b/community-build/community-projects/scala-stm @@ -0,0 +1 @@ +Subproject commit e25579f586a9d92242201d07faff5e586de1af69 diff --git a/community-build/community-projects/scalatestplus-junit b/community-build/community-projects/scalatestplus-junit new file mode 160000 index 000000000000..3857010185d9 --- /dev/null +++ b/community-build/community-projects/scalatestplus-junit @@ -0,0 +1 @@ +Subproject commit 3857010185d95c3b5fece4800759436ceebdc0e7 diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 2f55c6f4abad..3574dd481fa5 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -291,6 +291,13 @@ object projects: dependencies = List(scalatest, scalacheck) ) + lazy val scalatestplusJunit = SbtCommunityProject( + project = "scalatestplus-junit", + sbtTestCommand = "scalatestplus-junit/test", + sbtPublishCommand = "scalatestplus-junit/publishLocal", + dependencies = List(scalatest) + ) + lazy val scalaXml = SbtCommunityProject( project = "scala-xml", sbtTestCommand = "xml/test", @@ -535,6 +542,72 @@ object projects: dependencies = List(cats, catsMtl) ) + // 'Sciss/Lucre' with its dependencies: + + lazy val scissEqual = SbtCommunityProject( + project = "Equal", + sbtTestCommand = "rootJVM/test", + sbtPublishCommand = "rootJVM/publishLocal", + ) + + lazy val scissFingerTree = SbtCommunityProject( + project = "FingerTree", + sbtTestCommand = "rootJVM/test", + sbtPublishCommand = "rootJVM/publishLocal", + ) + + lazy val scissLog = SbtCommunityProject( + project = "Log", + sbtTestCommand = "rootJVM/test", + sbtPublishCommand = "rootJVM/publishLocal", + ) + + lazy val scissModel = SbtCommunityProject( + project = "Model", + sbtTestCommand = "rootJVM/test", + sbtPublishCommand = "rootJVM/publishLocal", + ) + + lazy val scissNumbers = SbtCommunityProject( + project = "Numbers", + sbtTestCommand = "rootJVM/test", + sbtPublishCommand = "rootJVM/publishLocal", + ) + + lazy val scissSerial = SbtCommunityProject( + project = "Serial", + sbtTestCommand = "rootJVM/test", + sbtPublishCommand = "rootJVM/publishLocal", + ) + + lazy val scissAsyncFile = SbtCommunityProject( + project = "AsyncFile", + sbtTestCommand = "rootJVM/test", + sbtPublishCommand = "rootJVM/publishLocal", + dependencies = List(scissLog), + ) + + lazy val scissSpan = SbtCommunityProject( + project = "Span", + sbtTestCommand = "rootJVM/test", + sbtPublishCommand = "rootJVM/publishLocal", + dependencies = List(scissSerial), + ) + + lazy val scalaSTM = SbtCommunityProject( + project = "scala-stm", + sbtTestCommand = "rootJVM/test", + sbtPublishCommand = "rootJVM/publishLocal", + dependencies = List(scalatestplusJunit), + ) + + lazy val scissLucre = SbtCommunityProject( + project = "Lucre", + sbtTestCommand = "adjunctJVM/test;baseJVM/test;confluentJVM/test;coreJVM/test;dataJVM/test;expr0JVM/test;expr1JVM/test;exprJVM/test;geomJVM/test;lucre-bdb/test;testsJVM/test", + sbtPublishCommand = "adjunctJVM/publishLocal;baseJVM/publishLocal;confluentJVM/publishLocal;coreJVM/publishLocal;dataJVM/publishLocal;expr0JVM/publishLocal;expr1JVM/publishLocal;exprJVM/publishLocal;geomJVM/publishLocal;lucre-bdb/publishLocal", + dependencies = List(scalaSTM, scissAsyncFile, scissEqual, scissFingerTree, scissLog, scissModel, scissNumbers, scissSerial, scissSpan), + ) + end projects def allProjects = projects.fields.of[CommunityProject].sortBy(_.project) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 772e25660e2e..29f24b8cb953 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -134,6 +134,19 @@ class CommunityBuildTestB extends CommunityBuildTest: @Test def simulacrumScalafixAnnotations = projects.simulacrumScalafixAnnotations.run() @Test def verify = projects.verify.run() @Test def xmlInterpolator = projects.xmlInterpolator.run() + + // 'Sciss/Lucre': + @Test def scissEqual = projects.scissEqual .run() + @Test def scissFingerTree = projects.scissFingerTree.run() + @Test def scissLog = projects.scissLog .run() + @Test def scissModel = projects.scissModel .run() + @Test def scissNumbers = projects.scissNumbers .run() + @Test def scissSerial = projects.scissSerial .run() + @Test def scissAsyncFile = projects.scissAsyncFile .run() + @Test def scissSpan = projects.scissSpan .run() + @Test def scalaSTM = projects.scalaSTM .run() + @Test def scissLucre = projects.scissLucre .run() + end CommunityBuildTestB class TestCategory From a71d7ca8bb91dc7c50ca46e79213a23f7a9ff849 Mon Sep 17 00:00:00 2001 From: Hanns Holger Rutz Date: Mon, 7 Dec 2020 22:37:23 +0100 Subject: [PATCH 2/3] add missing scalatest dependencies --- .../src/scala/dotty/communitybuild/projects.scala | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 3574dd481fa5..e496b7b72d17 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -548,12 +548,14 @@ object projects: project = "Equal", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", + dependencies = List(scalatest), ) lazy val scissFingerTree = SbtCommunityProject( project = "FingerTree", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", + dependencies = List(scalatest), ) lazy val scissLog = SbtCommunityProject( @@ -566,32 +568,35 @@ object projects: project = "Model", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", + dependencies = List(scalatest), ) lazy val scissNumbers = SbtCommunityProject( project = "Numbers", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", + dependencies = List(scalatest), ) lazy val scissSerial = SbtCommunityProject( project = "Serial", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", + dependencies = List(scalatest), ) lazy val scissAsyncFile = SbtCommunityProject( project = "AsyncFile", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", - dependencies = List(scissLog), + dependencies = List(scissLog, scalatest), ) lazy val scissSpan = SbtCommunityProject( project = "Span", sbtTestCommand = "rootJVM/test", sbtPublishCommand = "rootJVM/publishLocal", - dependencies = List(scissSerial), + dependencies = List(scissSerial, scalatest), ) lazy val scalaSTM = SbtCommunityProject( @@ -605,7 +610,7 @@ object projects: project = "Lucre", sbtTestCommand = "adjunctJVM/test;baseJVM/test;confluentJVM/test;coreJVM/test;dataJVM/test;expr0JVM/test;expr1JVM/test;exprJVM/test;geomJVM/test;lucre-bdb/test;testsJVM/test", sbtPublishCommand = "adjunctJVM/publishLocal;baseJVM/publishLocal;confluentJVM/publishLocal;coreJVM/publishLocal;dataJVM/publishLocal;expr0JVM/publishLocal;expr1JVM/publishLocal;exprJVM/publishLocal;geomJVM/publishLocal;lucre-bdb/publishLocal", - dependencies = List(scalaSTM, scissAsyncFile, scissEqual, scissFingerTree, scissLog, scissModel, scissNumbers, scissSerial, scissSpan), + dependencies = List(scalaSTM, scissAsyncFile, scissEqual, scissFingerTree, scissLog, scissModel, scissNumbers, scissSerial, scissSpan, scalatest), ) end projects From 2990b57e473b4f59f84821991b1bfedd0981f6fe Mon Sep 17 00:00:00 2001 From: Hanns Holger Rutz Date: Wed, 9 Dec 2020 13:34:22 +0100 Subject: [PATCH 3/3] move Lucre tests to CB-A ; disable intermediate tests; shorten test --- community-build/community-projects/Lucre | 2 +- .../scala/dotty/communitybuild/projects.scala | 1 + .../communitybuild/CommunityBuildTest.scala | 25 ++++++++++--------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/community-build/community-projects/Lucre b/community-build/community-projects/Lucre index ebbc12c4af12..b569546707c5 160000 --- a/community-build/community-projects/Lucre +++ b/community-build/community-projects/Lucre @@ -1 +1 @@ -Subproject commit ebbc12c4af12b07d6b9e8fc63306f6ce559b5a38 +Subproject commit b569546707c55dded1072cd544afd0e01b56d25c diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index e496b7b72d17..6d6103887a80 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -609,6 +609,7 @@ object projects: lazy val scissLucre = SbtCommunityProject( project = "Lucre", sbtTestCommand = "adjunctJVM/test;baseJVM/test;confluentJVM/test;coreJVM/test;dataJVM/test;expr0JVM/test;expr1JVM/test;exprJVM/test;geomJVM/test;lucre-bdb/test;testsJVM/test", + extraSbtArgs = List("-Dde.sciss.lucre.ShortTests=true"), sbtPublishCommand = "adjunctJVM/publishLocal;baseJVM/publishLocal;confluentJVM/publishLocal;coreJVM/publishLocal;dataJVM/publishLocal;expr0JVM/publishLocal;expr1JVM/publishLocal;exprJVM/publishLocal;geomJVM/publishLocal;lucre-bdb/publishLocal", dependencies = List(scalaSTM, scissAsyncFile, scissEqual, scissFingerTree, scissLog, scissModel, scissNumbers, scissSerial, scissSpan, scalatest), ) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 29f24b8cb953..ffb3474a61c0 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -102,6 +102,19 @@ class CommunityBuildTestA extends CommunityBuildTest: @Test def upickle = projects.upickle.run() @Test def utest = projects.utest.run() @Test def zio = projects.zio.run() + + // 'scala-stm' and 'Sciss/Lucre': + // @Test def scissEqual = projects.scissEqual .run() + // @Test def scissFingerTree = projects.scissFingerTree.run() + // @Test def scissLog = projects.scissLog .run() + // @Test def scissModel = projects.scissModel .run() + // @Test def scissNumbers = projects.scissNumbers .run() + // @Test def scissSerial = projects.scissSerial .run() + // @Test def scissAsyncFile = projects.scissAsyncFile .run() + // @Test def scissSpan = projects.scissSpan .run() + @Test def scalaSTM = projects.scalaSTM .run() + @Test def scissLucre = projects.scissLucre .run() + end CommunityBuildTestA @Category(Array(classOf[TestCategory])) @@ -135,18 +148,6 @@ class CommunityBuildTestB extends CommunityBuildTest: @Test def verify = projects.verify.run() @Test def xmlInterpolator = projects.xmlInterpolator.run() - // 'Sciss/Lucre': - @Test def scissEqual = projects.scissEqual .run() - @Test def scissFingerTree = projects.scissFingerTree.run() - @Test def scissLog = projects.scissLog .run() - @Test def scissModel = projects.scissModel .run() - @Test def scissNumbers = projects.scissNumbers .run() - @Test def scissSerial = projects.scissSerial .run() - @Test def scissAsyncFile = projects.scissAsyncFile .run() - @Test def scissSpan = projects.scissSpan .run() - @Test def scalaSTM = projects.scalaSTM .run() - @Test def scissLucre = projects.scissLucre .run() - end CommunityBuildTestB class TestCategory