Skip to content

Commit 0db7bf6

Browse files
committed
Simplify build config
1 parent 1cc8fce commit 0db7bf6

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

.github/workflows/ci.yml

+3-11
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,12 @@ jobs:
2525
name: Build and Test
2626
strategy:
2727
matrix:
28-
os: [ubuntu-latest, macos-latest]
28+
os: [ubuntu-latest]
2929
scala: [2.11.12, 2.12.15, 2.13.7, 3.0.2]
3030
java: [temurin@11]
31-
ci: [ciNode, ciFirefox, ciChrome, ciSafari, ciJSDOMNodeJS]
32-
exclude:
31+
ci: [ciNode, ciFirefox, ciChrome, ciJSDOMNodeJS]
32+
include:
3333
- ci: ciSafari
34-
os: ubuntu-latest
35-
- ci: ciNode
36-
os: macos-latest
37-
- ci: ciFirefox
38-
os: macos-latest
39-
- ci: ciChrome
40-
os: macos-latest
41-
- ci: ciJSDOMNodeJS
4234
os: macos-latest
4335
runs-on: ${{ matrix.os }}
4436
steps:

build.sbt

+3-5
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.15", "2.13.7", "3.0.2")
5050

5151
val PrimaryOS = "ubuntu-latest"
5252
val MacOS = "macos-latest"
53-
ThisBuild / githubWorkflowOSes := Seq(PrimaryOS, MacOS)
53+
ThisBuild / githubWorkflowOSes := Seq(PrimaryOS)
5454

5555
ThisBuild / githubWorkflowBuildPreamble ++= Seq(
5656
WorkflowStep.Use(
@@ -63,11 +63,9 @@ ThisBuild / githubWorkflowBuildPreamble ++= Seq(
6363
name = Some("Install jsdom"),
6464
cond = Some("matrix.ci == 'ciJSDOMNodeJS'")))
6565

66-
val ciVariants = List("ciNode", "ciFirefox", "ciChrome", "ciSafari", "ciJSDOMNodeJS")
66+
val ciVariants = List("ciNode", "ciFirefox", "ciChrome", "ciJSDOMNodeJS")
6767

68-
ThisBuild / githubWorkflowBuildMatrixExclusions += MatrixExclude(Map("ci" -> "ciSafari", "os" -> PrimaryOS))
69-
ThisBuild / githubWorkflowBuildMatrixExclusions ++= ciVariants.filter(_ != "ciSafari")
70-
.map(ci => MatrixExclude(Map("ci" -> ci, "os" -> MacOS)))
68+
ThisBuild / githubWorkflowBuildMatrixInclusions += MatrixInclude(Map.empty, Map("ci" -> "ciSafari", "os" -> MacOS))
7169

7270
ThisBuild / githubWorkflowBuildMatrixAdditions += "ci" -> ciVariants
7371

0 commit comments

Comments
 (0)