From da9c2df28f51516ae4d91a82358fa680ead5c849 Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Mon, 8 Mar 2021 18:29:32 -0500 Subject: [PATCH 1/5] Community build: Add onnx-scala --- .gitmodules | 3 +++ community-build/community-projects/onnx-scala | 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/onnx-scala diff --git a/.gitmodules b/.gitmodules index f156c436dc65..2fb394d4d4dc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -187,3 +187,6 @@ [submodule "community-build/community-projects/protoquill"] path = community-build/community-projects/protoquill url = https://github.com/dotty-staging/protoquill.git +[submodule "community-build/community-projects/onnx-scala"] + path = community-build/community-projects/onnx-scala + url = https://github.com/EmergentOrder/onnx-scala.git diff --git a/community-build/community-projects/onnx-scala b/community-build/community-projects/onnx-scala new file mode 160000 index 000000000000..0cf4c9b1f90b --- /dev/null +++ b/community-build/community-projects/onnx-scala @@ -0,0 +1 @@ +Subproject commit 0cf4c9b1f90bb67831dccf651408735ca0b74738 diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 155d08eb9db5..6966538df55f 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -614,6 +614,13 @@ object projects: scalacOptions = List("-language:implicitConversions"), // disabled -Ycheck-init, due to bug in macro ) + lazy val onnxScala = SbtCommunityProject( + project = "onnx-scala", + sbtTestCommand = "test", + sbtPublishCommand = "publishLocal", + dependencies = List() + ) + end projects def allProjects = List( @@ -680,6 +687,7 @@ def allProjects = List( projects.perspective, projects.akka, projects.protoquill, + projects.onnxScala, ) 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 814b877c4e52..bb22a7ef2679 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -109,6 +109,7 @@ class CommunityBuildTestA extends CommunityBuildTest: @Test def utest = projects.utest.run() @Test def zio = projects.zio.run() @Test def protoquill = projects.protoquill.run() + @Test def onnxScala = projects.onnxScala.run() // 'scala-stm' and 'Sciss/Lucre': // @Test def scissEqual = projects.scissEqual .run() From cc16fd7edc8edf21e54bea159038c4167c634f1b Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Mon, 8 Mar 2021 20:34:30 -0500 Subject: [PATCH 2/5] Community build: Add onnx-scala - take 2 --- community-build/community-projects/onnx-scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/onnx-scala b/community-build/community-projects/onnx-scala index 0cf4c9b1f90b..910f8549c2ba 160000 --- a/community-build/community-projects/onnx-scala +++ b/community-build/community-projects/onnx-scala @@ -1 +1 @@ -Subproject commit 0cf4c9b1f90bb67831dccf651408735ca0b74738 +Subproject commit 910f8549c2bafb6d3bfa761f3760acea1baeaa89 From ceb05938a85dc5b29e1c85775b647228f4d3dab2 Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Mon, 8 Mar 2021 23:09:16 -0500 Subject: [PATCH 3/5] Community build: Add onnx-scala - take 3 --- community-build/community-projects/onnx-scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/onnx-scala b/community-build/community-projects/onnx-scala index 910f8549c2ba..64cb918ea298 160000 --- a/community-build/community-projects/onnx-scala +++ b/community-build/community-projects/onnx-scala @@ -1 +1 @@ -Subproject commit 910f8549c2bafb6d3bfa761f3760acea1baeaa89 +Subproject commit 64cb918ea298ba2a9410d99d4dd565cdeed79b3e From aa74c129619eac5304b303708462f13ec8691607 Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Tue, 9 Mar 2021 09:04:37 -0400 Subject: [PATCH 4/5] Update community-build/src/scala/dotty/communitybuild/projects.scala Co-authored-by: Tom Grigg --- 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 6966538df55f..b5786c737430 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -618,7 +618,7 @@ object projects: project = "onnx-scala", sbtTestCommand = "test", sbtPublishCommand = "publishLocal", - dependencies = List() + dependencies = List(scalatest) ) end projects From f8c218d3b8fc414be6b1939d986935b79025b5eb Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Tue, 9 Mar 2021 08:06:51 -0500 Subject: [PATCH 5/5] Use dotty-staging fork --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2fb394d4d4dc..4db100bcc246 100644 --- a/.gitmodules +++ b/.gitmodules @@ -189,4 +189,4 @@ url = https://github.com/dotty-staging/protoquill.git [submodule "community-build/community-projects/onnx-scala"] path = community-build/community-projects/onnx-scala - url = https://github.com/EmergentOrder/onnx-scala.git + url = https://github.com/dotty-staging/onnx-scala.git