From 3ab6082110d9b07ee400cb6b4639d4c92f3b1b7b Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 25 Nov 2022 17:41:54 +0100 Subject: [PATCH 1/7] Add CI filter for individual community builds --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d78148c8fb6f..abead4133b44 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -256,6 +256,7 @@ jobs: github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]') && !contains(github.event.pull_request.body, '[skip community_build]') + && !contains(github.event.pull_request.body, '[skip community_build_a]') ) || ( github.event_name == 'workflow_dispatch' @@ -303,6 +304,7 @@ jobs: github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]') && !contains(github.event.pull_request.body, '[skip community_build]') + && !contains(github.event.pull_request.body, '[skip community_build_b]') ) || ( github.event_name == 'workflow_dispatch' @@ -350,6 +352,7 @@ jobs: github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]') && !contains(github.event.pull_request.body, '[skip community_build]') + && !contains(github.event.pull_request.body, '[skip community_build_c]') ) || ( github.event_name == 'workflow_dispatch' From 478e14ed34eff18c558d1995c3035983c2e5688b Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Mon, 28 Nov 2022 13:37:32 +0100 Subject: [PATCH 2/7] Update `munit` in community build --- 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 92f3ad9e8261..271891b083a1 160000 --- a/community-build/community-projects/munit +++ b/community-build/community-projects/munit @@ -1 +1 @@ -Subproject commit 92f3ad9e8261b4c142a551baaf61ef5fed84d36a +Subproject commit 271891b083a1df5519dea01ed5ee483d9cb09195 From 378ad10624e7478534d4bfa86f1493ec9e3dcf65 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 29 Nov 2022 15:48:31 +0100 Subject: [PATCH 3/7] Update `munit-cats-effect` in community build --- community-build/community-projects/munit-cats-effect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/munit-cats-effect b/community-build/community-projects/munit-cats-effect index 40e442827669..8cbf1c5b157f 160000 --- a/community-build/community-projects/munit-cats-effect +++ b/community-build/community-projects/munit-cats-effect @@ -1 +1 @@ -Subproject commit 40e44282766919a105e9dbbccbc3d14b79fee335 +Subproject commit 8cbf1c5b157f893485c5907fe655c82a5ac2c98c From 53bdb214b485d3b72632fb5e5028a7bdc729afb8 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Wed, 30 Nov 2022 08:44:36 +0100 Subject: [PATCH 4/7] Update `http4s` in community build --- community-build/community-projects/http4s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/http4s b/community-build/community-projects/http4s index aa85f5f2e660..2658551f0644 160000 --- a/community-build/community-projects/http4s +++ b/community-build/community-projects/http4s @@ -1 +1 @@ -Subproject commit aa85f5f2e660d1d4370d90316333718fd6517051 +Subproject commit 2658551f0644a3323ccf51c4225480a9f23e5aa3 From cd4797c2ad6e84a543321ab8ae5b12ddd177f72e Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 1 Dec 2022 11:02:01 +0100 Subject: [PATCH 5/7] Update cats, catsEffect and discipline --- community-build/community-projects/cats | 2 +- community-build/community-projects/cats-effect-3 | 2 +- community-build/community-projects/discipline | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/community-build/community-projects/cats b/community-build/community-projects/cats index 771c6c802f59..310e333746b7 160000 --- a/community-build/community-projects/cats +++ b/community-build/community-projects/cats @@ -1 +1 @@ -Subproject commit 771c6c802f59c72dbc1be1898081c9c882ddfeb0 +Subproject commit 310e333746b73cdd4d4f79fb750a53e8291c7da5 diff --git a/community-build/community-projects/cats-effect-3 b/community-build/community-projects/cats-effect-3 index 1d425e6efdf8..652572d17f14 160000 --- a/community-build/community-projects/cats-effect-3 +++ b/community-build/community-projects/cats-effect-3 @@ -1 +1 @@ -Subproject commit 1d425e6efdf8aee619a4a906e950473c51f78161 +Subproject commit 652572d17f141ab1f7a7dbdc5c73fcb831000b87 diff --git a/community-build/community-projects/discipline b/community-build/community-projects/discipline index 09c975b18dc0..a6c7b2b3853b 160000 --- a/community-build/community-projects/discipline +++ b/community-build/community-projects/discipline @@ -1 +1 @@ -Subproject commit 09c975b18dc0b4e10499fb2922abac82ea8b5252 +Subproject commit a6c7b2b3853b82757957e312b6b10ab61c734878 From dd2732faa78028caf3c610d5b89f61a363455bed Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 2 Dec 2022 09:12:46 +0100 Subject: [PATCH 6/7] Disable -Ysafe-init on catsEffect3 --- community-build/src/scala/dotty/communitybuild/projects.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index fe3f5cfed5a2..d20238909b88 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -487,7 +487,8 @@ object projects: sbtTestCommand = "ciJVM", sbtPublishCommand = "publishLocal", sbtDocCommand = ";coreJVM/doc ;lawsJVM/doc ;kernelJVM/doc", - dependencies = List(cats, coop, disciplineSpecs2, scalacheck) + dependencies = List(cats, coop, disciplineSpecs2, scalacheck), + scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init") ) lazy val scalaParallelCollections = SbtCommunityProject( From 9b590e761b8a800dcbf09f359aa22f63df85f833 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 2 Dec 2022 11:38:28 +0100 Subject: [PATCH 7/7] Update `discipline-specs2` in community build --- community-build/community-projects/discipline-specs2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/discipline-specs2 b/community-build/community-projects/discipline-specs2 index e689c3e809a8..d2afe01c3f21 160000 --- a/community-build/community-projects/discipline-specs2 +++ b/community-build/community-projects/discipline-specs2 @@ -1 +1 @@ -Subproject commit e689c3e809a89a03cdbbb3a1771e33148715f6c7 +Subproject commit d2afe01c3f21306462de4d5471f2889aaefe44dd