Skip to content

Commit

Permalink
exclude ScalaJS on Scala 2.12 because dependencies are not available …
Browse files Browse the repository at this point in the history
…on that platform
  • Loading branch information
bpholt committed Jul 28, 2024
1 parent 72484d0 commit 7c3f4e5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ jobs:
scala: [3, 2.13, 2.12]
java: [temurin@17]
project: [rootJS, rootJVM]
exclude:
- scala: 2.12
project: rootJS
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
Expand Down Expand Up @@ -161,16 +164,6 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12, rootJS)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS

- name: Inflate target directories (2.12, rootJS)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12, rootJVM)
uses: actions/download-artifact@v4
with:
Expand Down
1 change: 0 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ pull_request_rules:
- status-success=Build and Test (ubuntu-latest, 3, temurin@17, rootJVM)
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@17, rootJS)
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@17, rootJVM)
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@17, rootJS)
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@17, rootJVM)
- '#approved-reviews-by>=1'
actions:
Expand Down
12 changes: 9 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import org.typelevel.sbt.gha.MatrixExclude
import org.typelevel.scalacoptions.ScalacOptions
import sbtcrossproject.CrossProject

ThisBuild / crossScalaVersions := Seq("3.3.3", "2.13.14", "2.12.19")
ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.head
ThisBuild / githubWorkflowBuildMatrixExclusions := Seq(
MatrixExclude(Map(
"scala" -> "2.12",
"project" -> "rootJS",
)),
)
ThisBuild / organization := "com.dwolla"
ThisBuild / homepage := Some(url("https://github.com/Dwolla/http4s-consul-middleware"))
ThisBuild / licenses += ("MIT", url("https://opensource.org/licenses/MIT"))
Expand Down Expand Up @@ -100,7 +106,7 @@ lazy val `smithy4s-consul-middleware` = crossProject(JSPlatform, JVMPlatform)
),
)
.jsSettings(
crossScalaVersions := Seq("3.3.3", "2.13.14"),
crossScalaVersions := (ThisBuild / crossScalaVersions).value.filterNot(_.startsWith("2.12")),
)
.dependsOn(`http4s-consul-middleware`)
.enablePlugins(Smithy4sCodegenPlugin)
Expand All @@ -126,7 +132,7 @@ lazy val `smithy4s-consul-middleware-tests` = crossProject(JSPlatform, JVMPlatfo
),
)
.jsSettings(
crossScalaVersions := Seq("3.3.3", "2.13.14"),
crossScalaVersions := (ThisBuild / crossScalaVersions).value.filterNot(_.startsWith("2.12")),
)
.dependsOn(`smithy4s-consul-middleware`)
.enablePlugins(Smithy4sCodegenPlugin, NoPublishPlugin)

0 comments on commit 7c3f4e5

Please sign in to comment.