From 51cc2b8aab0ec5baf38633110cb77f2115e789d2 Mon Sep 17 00:00:00 2001 From: Eric Torreborre Date: Thu, 21 Oct 2021 10:25:11 +0200 Subject: [PATCH 1/3] added specs2 --- .gitmodules | 3 +++ community-build/community-projects/specs2 | 1 + .../src/scala/dotty/communitybuild/projects.scala | 8 ++++++++ .../scala/dotty/communitybuild/CommunityBuildTest.scala | 1 + 4 files changed, 13 insertions(+) create mode 160000 community-build/community-projects/specs2 diff --git a/.gitmodules b/.gitmodules index 1b50ef1cc54b..2977e923b55e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -213,3 +213,6 @@ [submodule "community-build/community-projects/scala-java8-compat"] path = community-build/community-projects/scala-java8-compat url = https://github.com/dotty-staging/scala-java8-compat.git +[submodule "community-build/community-projects/specs2"] + path = community-build/community-projects/specs2 + url = https://github.com/etorreborre/specs2.git diff --git a/community-build/community-projects/specs2 b/community-build/community-projects/specs2 new file mode 160000 index 000000000000..0652daeefb57 --- /dev/null +++ b/community-build/community-projects/specs2 @@ -0,0 +1 @@ +Subproject commit 0652daeefb57c2d51e3f16ea5c44929bdba722bf diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 6d31cd73b54c..c258154a5c20 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -731,6 +731,13 @@ object projects: dependencies = List(scalaJava8Compat, scalatest) ) + lazy val specs2 = SbtCommunityProject( + project = "specs2", + sbtTestCommand = "core/test", + sbtPublishCommand = "core/publishLocal", + dependencies = List() + ) + end projects def allProjects = List( @@ -809,6 +816,7 @@ def allProjects = List( projects.fs2, projects.libretto, projects.jacksonModuleScala, + projects.specs2, ) lazy val projectMap = allProjects.groupBy(_.project) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index c1d748b4d3ad..9b5c17e85965 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -91,6 +91,7 @@ class CommunityBuildTestC: @Test def sconfig = projects.sconfig.run() @Test def shapeless = projects.shapeless.run() @Test def sourcecode = projects.sourcecode.run() + @Test def specs2 = projects.specs2.run() @Test def stdLib213 = projects.stdLib213.run() @Test def ujson = projects.ujson.run() @Test def upickle = projects.upickle.run() From 6641203322819a4925bb8ed969319d814b207f70 Mon Sep 17 00:00:00 2001 From: Eric Torreborre Date: Thu, 4 Nov 2021 09:58:17 +0100 Subject: [PATCH 2/3] exclude some specs2 tests from CI --- community-build/src/scala/dotty/communitybuild/projects.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index c258154a5c20..61c72f8088f0 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -733,7 +733,7 @@ object projects: lazy val specs2 = SbtCommunityProject( project = "specs2", - sbtTestCommand = "core/test", + sbtTestCommand = "core/testOnly -- exclude ci", sbtPublishCommand = "core/publishLocal", dependencies = List() ) From e939c92f058fb1151e606e8de62f0bb1f75b68c6 Mon Sep 17 00:00:00 2001 From: Eric Torreborre Date: Tue, 9 Nov 2021 09:27:22 +0100 Subject: [PATCH 3/3] use the https://github.com/dotty-staging/specs2 repo as a submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2977e923b55e..d93aab9aa8fe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -215,4 +215,4 @@ url = https://github.com/dotty-staging/scala-java8-compat.git [submodule "community-build/community-projects/specs2"] path = community-build/community-projects/specs2 - url = https://github.com/etorreborre/specs2.git + url = https://github.com/dotty-staging/specs2.git