From cc18858839f43a9b89c3cddbc63a3c641bba9f4f Mon Sep 17 00:00:00 2001 From: Gabriele Petronella Date: Fri, 7 Feb 2020 08:44:18 +0100 Subject: [PATCH 1/3] Add MUnit to the community build --- .gitmodules | 3 +++ community-build/community-projects/munit | 1 + .../scala/dotty/communitybuild/CommunityBuildTest.scala | 8 ++++++++ 3 files changed, 12 insertions(+) create mode 160000 community-build/community-projects/munit diff --git a/.gitmodules b/.gitmodules index 1b59ef21c5bb..2a8eb6bb3cab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -71,3 +71,6 @@ [submodule "community-build/community-projects/zio"] path = community-build/community-projects/zio url = https://github.com/dotty-staging/zio.git +[submodule "community-build/community-projects/munit"] + path = community-build/community-projects/munit + url = https://github.com/dotty-staging/munit.git diff --git a/community-build/community-projects/munit b/community-build/community-projects/munit new file mode 160000 index 000000000000..e0c3caca663b --- /dev/null +++ b/community-build/community-projects/munit @@ -0,0 +1 @@ +Subproject commit e0c3caca663bc59bab520b729c88b5413f17a7ff diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 0960e348de78..db5e98c9386a 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -274,6 +274,13 @@ object projects: sbtTestCommand = "testJVMDotty", sbtUpdateCommand = "update" ) + + lazy val munit = SbtCommunityProject( + project = "munit", + sbtTestCommand = "testsJVM/test", + sbtUpdateCommand = "munitJVM/update", + ) + end projects @Category(Array(classOf[TestCategory])) @@ -348,6 +355,7 @@ class CommunityBuildTest: @Test def effpi = projects.effpi.run() @Test def sconfig = projects.sconfig.run() @Test def zio = projects.zio.run() + @Test def munit = projects.munit.run() end CommunityBuildTest class TestCategory From 285a447b22390799ac53e0217e9804002332d517 Mon Sep 17 00:00:00 2001 From: Gabriele Petronella Date: Fri, 7 Feb 2020 08:45:14 +0100 Subject: [PATCH 2/3] Fix broken link in readme --- community-build/test/scala/dotty/communitybuild/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/test/scala/dotty/communitybuild/readme.md b/community-build/test/scala/dotty/communitybuild/readme.md index f4954c95f80f..4752badbb001 100644 --- a/community-build/test/scala/dotty/communitybuild/readme.md +++ b/community-build/test/scala/dotty/communitybuild/readme.md @@ -14,4 +14,4 @@ To add your project to the community build you can follow these steps: 2. Open a PR against this repo that: - Adds your project as a new git submodule - `git submodule add https://github.com/lampepfl/XYZ.git community-build/community-projects/XYZ` - - Adds a test in [CommunityBuildTest.scala](https://github.com/lampepfl/dotty/blob/master/src/test/scala/dotty/community-build/src/test/scala/dotty/communitybuild/CommunityBuildTest.scala) + - Adds a test in [CommunityBuildTest.scala](https://github.com/lampepfl/dotty/blob/master/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala) From bd468ee68704f98b4153cabb989d51876e2d92a9 Mon Sep 17 00:00:00 2001 From: Gabriele Petronella Date: Tue, 11 Feb 2020 15:32:52 +0100 Subject: [PATCH 3/3] Update munit submodule --- community-build/community-projects/munit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/munit b/community-build/community-projects/munit index e0c3caca663b..17db2aa50172 160000 --- a/community-build/community-projects/munit +++ b/community-build/community-projects/munit @@ -1 +1 @@ -Subproject commit e0c3caca663bc59bab520b729c88b5413f17a7ff +Subproject commit 17db2aa50172fe2811ee7c6799c0530b1a211be0