Merge pull request #1295 from xuwei-k/fix-CI

fix CI setting
fthomas · Sep 24, 2024 · 5106bf9 · 5106bf9
2 parents 4126027 + 05e419e
commit 5106bf9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,11 +59,11 @@ jobs:
         run: sbt githubWorkflowCheck
 
       - name: Build project (Scala 2)
-        if: matrix.scala == '2.12.20' || matrix.scala == '2.13.14'
+        if: matrix.scala == '2.12' || matrix.scala == '2.13'
         run: sbt '++ ${{ matrix.scala }}' validateJVM validateJS validateNative
 
       - name: Build project (Scala 3)
-        if: matrix.scala == '3.3.3'
+        if: matrix.scala == '3'
         run: sbt '++ ${{ matrix.scala }}' validateJVM30 validateJS30 validateNative30
 
       - name: Codecov

diff --git a/build.sbt b/build.sbt
@@ -103,12 +103,12 @@ ThisBuild / githubWorkflowBuild :=
     WorkflowStep.Sbt(
       List("validateJVM", "validateJS", "validateNative"),
       name = Some("Build project (Scala 2)"),
-      cond = Some(s"matrix.scala == '$Scala_2_12' || matrix.scala == '$Scala_2_13'")
+      cond = Some(s"matrix.scala == '2.12' || matrix.scala == '2.13'")
     ),
     WorkflowStep.Sbt(
       List("validateJVM30", "validateJS30", "validateNative30"),
       name = Some("Build project (Scala 3)"),
-      cond = Some(s"matrix.scala == '$Scala_3'")
+      cond = Some(s"matrix.scala == '3'")
     ),
     WorkflowStep.Use(UseRef.Public("codecov", "codecov-action", "v1"), name = Some("Codecov"))
   )