diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 0c43e4d0..590d8503 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -22,17 +22,20 @@ env: # jobs jobs: build: - name: build (${{ matrix.scala }}) + name: build (${{ matrix.name }}) runs-on: ubuntu-latest strategy: matrix: # supported scala versions include: - scala: 2.12.15 + name: Scala2-12 test-tasks: coverage test coverageReport - scala: 2.13.6 + name: Scala2-13 test-tasks: coverage test coverageReport - scala: 3.0.2 + name: Scala3 test-tasks: test # scoverage doesn’t support Scala 3 steps: diff --git a/.mergify.yml b/.mergify.yml index 5ff4b8b4..de10bf4c 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,9 +4,9 @@ pull_request_rules: - "#approved-reviews-by>=1" - check-success=codecov/patch - check-success=codecov/project - - check-success=build (2.12.14) - - check-success=build (2.13.6) - - check-success=build (3.0.1) + - check-success=build (Scala2-12) + - check-success=build (Scala2-13) + - check-success=build (Scala3) - base=master - label!=work-in-progress actions: @@ -18,9 +18,9 @@ pull_request_rules: - author=scala-steward - check-success=codecov/patch - check-success=codecov/project - - check-success=build (2.12.14) - - check-success=build (2.13.6) - - check-success=build (3.0.1) + - check-success=build (Scala2-12) + - check-success=build (Scala2-13) + - check-success=build (Scala3) - base=master actions: merge: