From 05e419e078a160306c238bb30680f89e4910d73c Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Tue, 24 Sep 2024 07:45:15 +0900 Subject: [PATCH] fix CI setting --- .github/workflows/ci.yml | 4 ++-- build.sbt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b74dbac0..b5bab5d22 100644 --- 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 index 22c770d17..d76507da1 100644 --- 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")) )