From a3487bf90055e5587add5f89377e951cada9c851 Mon Sep 17 00:00:00 2001 From: Andrew Valencik Date: Wed, 5 Apr 2023 15:47:28 -0400 Subject: [PATCH] Cross build to scala 2.12 --- .github/workflows/ci.yml | 22 +++++++++++++++++++++- build.sbt | 3 ++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b54eee..40730f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10, 3.2.1] + scala: [2.12.17, 2.13.10, 3.2.1] java: [temurin@11] project: [rootJS, rootJVM] runs-on: ${{ matrix.os }} @@ -147,6 +147,26 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: Download target directories (2.12.17, rootJS) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJS + + - name: Inflate target directories (2.12.17, rootJS) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.12.17, rootJVM) + uses: actions/download-artifact@v2 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM + + - name: Inflate target directories (2.12.17, rootJVM) + run: | + tar xf targets.tar + rm targets.tar + - name: Download target directories (2.13.10, rootJS) uses: actions/download-artifact@v2 with: diff --git a/build.sbt b/build.sbt index 4f2ef11..67ca1e8 100644 --- a/build.sbt +++ b/build.sbt @@ -23,8 +23,9 @@ ThisBuild / tlCiReleaseBranches := Seq("main") // use JDK 11 ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11")) +val Scala212 = "2.12.17" val Scala213 = "2.13.10" -ThisBuild / crossScalaVersions := Seq(Scala213, "3.2.1") +ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, "3.2.1") ThisBuild / scalaVersion := Scala213 // the default Scala lazy val root = tlCrossRootProject.aggregate(core)