From 8f8969cbe71a4f9cdd125057b3c16127ccc2d1f9 Mon Sep 17 00:00:00 2001 From: Pawel Lipski Date: Mon, 6 May 2024 19:09:34 +0200 Subject: [PATCH] Drop old Scala versions from CI --- .github/workflows/standard-workflow.yml | 31 +++---------------------- build.sbt | 19 ++++++--------- 2 files changed, 10 insertions(+), 40 deletions(-) diff --git a/.github/workflows/standard-workflow.yml b/.github/workflows/standard-workflow.yml index 31765e69..b3b5e2c6 100644 --- a/.github/workflows/standard-workflow.yml +++ b/.github/workflows/standard-workflow.yml @@ -55,14 +55,11 @@ jobs: - name: Run tests run: | - sbt "++ 2.12.13 test" - sbt "++ 2.12.14 test" - sbt "++ 2.12.15 test" sbt "++ 2.12.16 test" sbt "++ 2.12.17 test" sbt "++ 2.12.18 test" - test-213-1: + test-213: runs-on: ubuntu-latest steps: @@ -75,28 +72,6 @@ jobs: - name: Run tests run: | - sbt "++ 2.13.2 test" - sbt "++ 2.13.3 test" - sbt "++ 2.13.4 test" - sbt "++ 2.13.5 test" - sbt "++ 2.13.6 test" - sbt "++ 2.13.7 test" - - test-213-2: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - uses: coursier/cache-action@v6 - - uses: coursier/setup-action@v1 - - - name: Compile - run: sbt compile Test/compile - - - name: Run tests - run: | - sbt "++ 2.13.8 test" - sbt "++ 2.13.9 test" sbt "++ 2.13.10 test" sbt "++ 2.13.11 test" sbt "++ 2.13.12 test" @@ -140,7 +115,7 @@ jobs: # patch-and-push-to-psh: if: github.event_name != 'pull_request' - needs: [code-style-check, test-212, test-213-1, test-213-2, test-sbt-plugin, run-examples] + needs: [code-style-check, test-212, test-213, test-sbt-plugin, run-examples] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -170,7 +145,7 @@ jobs: # publish-maven-artifacts: - needs: [code-style-check, test-212, test-213-1, test-213-2, test-sbt-plugin, run-examples] + needs: [code-style-check, test-212, test-213, test-sbt-plugin, run-examples] if: github.event_name != 'pull_request' runs-on: ubuntu-latest steps: diff --git a/build.sbt b/build.sbt index 617ffee0..8de2842c 100644 --- a/build.sbt +++ b/build.sbt @@ -12,20 +12,15 @@ initialize ~= { _ => lazy val targetScalaVersions = List(scalaVersion213, scalaVersion212) lazy val testAgainstScalaVersions = targetScalaVersions ++ List( - "2.12.13", - "2.12.14", - "2.12.15", "2.12.16", "2.12.17", - "2.13.2", - "2.13.3", - "2.13.4", - "2.13.5", - "2.13.6", - "2.13.7", - "2.13.8", - "2.13.9", - "2.13.10") + "2.12.18", + "2.13.10", + "2.13.11", + "2.13.12", + "2.13.13", + "2.13.14", + ) ThisBuild / scalaVersion := targetScalaVersions.head ThisBuild / organization := "org.virtuslab.ash"