Merge branch 'main' into update/sbt-scoverage-2.0.12

hablapps · May 13, 2024 · fbb935a · fbb935a
2 parents a706e16 + 053544f
commit fbb935a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,7 +64,8 @@ jobs:
     uses: ./.github/workflows/wc_build.yml
     with:
       matrix_filter: "[]"
-    secrets: inherit
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   # CHECK MDOC IS OK
   check_mdoc:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,8 @@ jobs:
     uses: ./.github/workflows/wc_build.yml
     with:
       matrix_filter: "[?isRelease==`release`]"
-    secrets: inherit
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   # PUBLISH JARS AT MAVEN CENTRAL
   matrix_prep:

diff --git a/.github/workflows/wc_build.yml b/.github/workflows/wc_build.yml
@@ -8,7 +8,7 @@ on:
         type: string
     secrets:
       CODECOV_TOKEN:
-        required: true
+        required: false
 
 jobs:
   matrix_prep:

diff --git a/build.sbt b/build.sbt
@@ -125,7 +125,7 @@ lazy val core = project
       "org.typelevel"          %% "cats-core"               % "2.10.0",
       "com.lihaoyi"            %% "sourcecode"              % "0.3.1",
       "com.chuusai"            %% "shapeless"               % "2.3.10",
-      "org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0",
+      "org.scala-lang.modules" %% "scala-collection-compat" % "2.12.0",
       "com.github.mrpowers"    %% "spark-fast-tests"        % "1.3.0"  % "test",
       "org.scalatest"          %% "scalatest"               % "3.2.18" % "test"
     ),