Merge branch 'master' into cache-fix

zio · Sep 29, 2023 · 7ae22c1 · 7ae22c1
2 parents 13ba5eb + a6a17ae
commit 7ae22c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -82,10 +82,6 @@ jobs:
     if: ${{github.event_name != 'pull_request'}}
     runs-on: ubuntu-latest
     needs: build
-    strategy:
-      fail-fast: false
-      matrix:
-        scala: [ 2.12.x, 2.13.x, 3.3.x ]
     env:
       CI_RELEASE: publishSigned # By default, sbt-ci-release uses the `+publishSigned` which is publishing for all the Scala versions configured, which is not what we want
       CI_SNAPSHOT_RELEASE: publish # By default, sbt-ci-release uses the `+publish` which is publishing for all the Scala versions configured, which is not what we want
@@ -97,7 +93,10 @@ jobs:
           distribution: temurin
           java-version: '8'
           check-latest: true
-      - run: sbt ++${{ matrix.scala }} -Dquill.scala.version=${{ matrix.scala }} ci-release
+      - run: |
+          sbt ++2.12.x -Dquill.scala.version=2.12.x -Dquill.macro.log=false ci-release
+          sbt ++2.13.x -Dquill.scala.version=2.13.x -Dquill.macro.log=false ci-release
+          sbt ++3.3.x -Dquill.scala.version=3.3.x -Dquill.macro.log=false ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}

diff --git a/build.sbt b/build.sbt
@@ -73,19 +73,7 @@ lazy val allModules =
   baseModules ++ dbModules ++ jasyncModules ++ codegenModules ++ bigdataModules ++ docsModules
 
 lazy val scala213Modules =
-  baseModules ++ dbModules ++ codegenModules ++ Seq[sbt.ClasspathDep[sbt.ProjectReference]](
-    `quill-cassandra`,
-    `quill-cassandra-alpakka`,
-    `quill-cassandra-monix`,
-    `quill-cassandra-zio`,
-    `quill-orientdb`,
-    `quill-jasync`,
-    `quill-jasync-postgres`,
-    `quill-jasync-mysql`,
-    `quill-jasync-zio`,
-    `quill-jasync-zio-postgres`,
-    `quill-spark`
-  )
+  baseModules ++ dbModules ++ jasyncModules ++ codegenModules ++ bigdataModules
 
 lazy val scala3Modules = Seq[sbt.ClasspathDep[sbt.ProjectReference]](`quill-engine`, `quill-util`)
 
@@ -150,24 +138,15 @@ lazy val filteredModules = {
         println("SBT =:> Invoking Aggregate Project")
         Seq[sbt.ClasspathDep[sbt.ProjectReference]]()
       case _ | "all" =>
-        // Workaround for https://github.com/sbt/sbt/issues/3465
-        if (isScala213) {
-          println("SBT =:> Compiling Scala 2.13 Modules")
-          baseModules ++ dbModules ++ jasyncModules
-        } else {
-          println("SBT =:> Compiling All Modules")
-          allModules
-          // Note, can't do this because things like inform (i.e. formatting) actually do run for all modules
-          // throw new IllegalStateException("Tried to build all modules. Not allowed.")
-        }
+        println("SBT =:> Compiling All Modules")
+        allModules
     }
 
   val selectedModules = {
     val modules =
       moduleStrings
-        .map(matchModules(_))
-        .map(seq => ListSet(seq: _*))
-        .flatMap(elem => elem)
+        .map(matchModules)
+        .flatMap(seq => ListSet(seq: _*))
 
     if (isScala213) {
       println("SBT =:> Compiling 2.13 Modules Only")