diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 68c220a..b8fc13b 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -30,10 +30,10 @@ jobs: # supported scala versions include: - scala: 2.13.8 - name: Scala2 + name: Scala2_13 test-tasks: test #coverage suspended due a bug - - scala: 3.1.3 - name: Scala3 + - scala: 3.2.1 + name: Scala3_2 test-tasks: test # scoverage doesn’t support Scala 3 steps: diff --git a/.mergify.yml b/.mergify.yml index 9d8bd7e..fa9845d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,8 +4,8 @@ pull_request_rules: - "#approved-reviews-by>=1" - check-success=codecov/patch - check-success=codecov/project - - check-success=build (Scala2) - - check-success=build (Scala3) + - check-success=build (Scala2_13) + - check-success=build (Scala3_2) - base=main - label!=work-in-progress actions: @@ -15,8 +15,8 @@ pull_request_rules: - name: automatic merge for master when CI passes and author is steward conditions: - author=scala-steward - - check-success=build (Scala2) - - check-success=build (Scala3) + - check-success=build (Scala2_13) + - check-success=build (Scala3_2) - base=main actions: merge: @@ -25,8 +25,8 @@ pull_request_rules: - name: automatic merge for master when CI passes and author is dependabot conditions: - author=dependabot[bot] - - check-success=build (Scala2) - - check-success=build (Scala3) + - check-success=build (Scala2_13) + - check-success=build (Scala3_2) - base=main actions: merge: diff --git a/build.sbt b/build.sbt index 2b398b3..6a02a9b 100644 --- a/build.sbt +++ b/build.sbt @@ -4,8 +4,8 @@ import ModuleMdocPlugin.autoImport.mdocScalacOptions lazy val prjName = "erules" lazy val org = "com.github.geirolz" lazy val scala213 = "2.13.8" -lazy val scala31 = "3.2.1" -lazy val supportedScalaVersions = List(scala213, scala31) +lazy val scala32 = "3.2.1" +lazy val supportedScalaVersions = List(scala213, scala32) //## global project to no publish ## lazy val erules: Project = project