From 3125bdd9227147e7672bbf54ef9c78095256d637 Mon Sep 17 00:00:00 2001 From: Aleksander Boruch-Gruszecki Date: Tue, 23 Mar 2021 12:01:39 +0100 Subject: [PATCH 1/3] Add PSBP (old name: PDBP) to community build --- .gitmodules | 6 +++--- community-build/community-projects/pdbp | 1 - community-build/community-projects/psbp | 1 + .../src/scala/dotty/communitybuild/projects.scala | 10 +++++----- .../dotty/communitybuild/CommunityBuildTest.scala | 1 + 5 files changed, 10 insertions(+), 9 deletions(-) delete mode 160000 community-build/community-projects/pdbp create mode 160000 community-build/community-projects/psbp diff --git a/.gitmodules b/.gitmodules index 72af6f16258c..fbf564a0474c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,9 +25,6 @@ [submodule "community-build/community-projects/stdLib213"] path = community-build/community-projects/stdLib213 url = https://github.com/dotty-staging/scala -[submodule "community-build/community-projects/pdbp"] - path = community-build/community-projects/pdbp - url = https://github.com/dotty-staging/pdbp [submodule "community-build/community-projects/sourcecode"] path = community-build/community-projects/sourcecode url = https://github.com/dotty-staging/sourcecode @@ -193,3 +190,6 @@ [submodule "community-build/community-projects/cask"] path = community-build/community-projects/cask url = https://github.com/dotty-staging/cask.git +[submodule "community-build/community-projects/psbp"] + path = community-build/community-projects/psbp + url = git@github.com:PSBP-Library/psbp-library.github.io.git diff --git a/community-build/community-projects/pdbp b/community-build/community-projects/pdbp deleted file mode 160000 index 0c1fe0a5fd68..000000000000 --- a/community-build/community-projects/pdbp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0c1fe0a5fd681ff4d94a58dc6f73e019982e9d78 diff --git a/community-build/community-projects/psbp b/community-build/community-projects/psbp new file mode 160000 index 000000000000..8f08f65e0745 --- /dev/null +++ b/community-build/community-projects/psbp @@ -0,0 +1 @@ +Subproject commit 8f08f65e0745c58535f7e2446545c8d6a620eb3d diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 673c21c3a42c..c26ce05fcccd 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -362,11 +362,10 @@ object projects: sbtDocCommand = "set ThisBuild / useEffpiPlugin := false; effpi/doc; benchmarks/doc; examples/doc; pluginBenchmarks/doc", ) - // TODO @odersky? It got broken by #5458 - // val pdbp = test( - // project = "pdbp", - // sbtTestCommand = "compile", - // ) + val psbp = SbtCommunityProject( + project = "psbp", + sbtTestCommand = "compile", + ) lazy val sconfig = SbtCommunityProject( project = "sconfig", @@ -709,6 +708,7 @@ def allProjects = List( projects.akka, projects.protoquill, projects.onnxScala, + projects.psbp, ) 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 9c056bdb9ac4..bf03c8577383 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -102,6 +102,7 @@ class CommunityBuildTestA extends CommunityBuildTest: // @Test def scissSpan = projects.scissSpan .run() @Test def scissLucre = projects.scissLucre.run() @Test def zio = projects.zio.run() + @Test def psbp = projects.psbp.run() end CommunityBuildTestA @Category(Array(classOf[TestCategory])) From 055a26635208bc1b142522e05911a0fd3ef6dfef Mon Sep 17 00:00:00 2001 From: Aleksander Boruch-Gruszecki Date: Mon, 15 Mar 2021 10:26:17 +0100 Subject: [PATCH 2/3] Update .gitmodules Co-authored-by: Tom Grigg --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index fbf564a0474c..5c641810f758 100644 --- a/.gitmodules +++ b/.gitmodules @@ -192,4 +192,4 @@ url = https://github.com/dotty-staging/cask.git [submodule "community-build/community-projects/psbp"] path = community-build/community-projects/psbp - url = git@github.com:PSBP-Library/psbp-library.github.io.git + url = https://github.com/PSBP-Library/psbp-library.github.io.git From df06c34fb5f34c74c089eb3f3bf1db2bfe0f54ed Mon Sep 17 00:00:00 2001 From: Aleksander Boruch-Gruszecki Date: Tue, 23 Mar 2021 09:04:43 +0100 Subject: [PATCH 3/3] Update url of PSBP --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 5c641810f758..98b588826ecc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -192,4 +192,4 @@ url = https://github.com/dotty-staging/cask.git [submodule "community-build/community-projects/psbp"] path = community-build/community-projects/psbp - url = https://github.com/PSBP-Library/psbp-library.github.io.git + url = https://github.com/dotty-staging/psbp-library.github.io