diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f22d0c0e..f1b59c62f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,9 +31,17 @@ jobs: scala: [2.12.17, 2.13.10, 3.2.1] java: [temurin@11] project: [rootJS, rootJVM, rootNative] + include: + - scala: 3.2.1 + java: temurin@11 + project: rootNative + os: macos-latest exclude: - scala: 3.2.1 project: rootJVM + - scala: 3.2.1 + project: rootNative + os: ubuntu-latest runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -224,16 +232,6 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.2.1, rootNative) - uses: actions/download-artifact@v2 - with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1-rootNative - - - name: Inflate target directories (3.2.1, rootNative) - run: | - tar xf targets.tar - rm targets.tar - - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' run: echo $PGP_SECRET | base64 -di | gpg --import diff --git a/build.sbt b/build.sbt index 1b214881f..74fe2a9b7 100644 --- a/build.sbt +++ b/build.sbt @@ -5,10 +5,20 @@ ThisBuild / crossScalaVersions := Seq("2.12.17", scala213, scala3) ThisBuild / tlBaseVersion := "2.5" -ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11")) +val temurin11 = JavaSpec.temurin("11") +ThisBuild / githubWorkflowJavaVersions := Seq(temurin11) -ThisBuild / githubWorkflowBuildMatrixExclusions += // TODO - MatrixExclude(Map("scala" -> scala3, "project" -> "rootJVM")) +ThisBuild / githubWorkflowBuildMatrixExclusions ++= Seq( + MatrixExclude(Map("scala" -> scala3, "project" -> "rootJVM")), // TODO + MatrixExclude( + Map("scala" -> scala3, "project" -> "rootNative", "os" -> "ubuntu-latest") + ) // run on macOS instead +) + +ThisBuild / githubWorkflowBuildMatrixInclusions += + MatrixInclude(Map("scala" -> scala3, "java" -> temurin11.render, "project" -> "rootNative"), + Map("os" -> "macos-latest") + ) val tzdbVersion = "2019c" val scalajavaLocalesVersion = "1.5.1" diff --git a/project/plugins.sbt b/project/plugins.sbt index a379598d9..0e1ddfd53 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.17") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.9") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.11")