Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit d345e33

Browse files
authored
Merge pull request #250 from exoego/matrix
Simlify build matrix
2 parents 6d9dc88 + 5ecd436 commit d345e33

File tree

2 files changed

+19
-26
lines changed

2 files changed

+19
-26
lines changed

.travis.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,13 @@ jdk:
1010

1111
env:
1212
matrix:
13-
- TRAVIS_NODE_VERSION="14.3.0" SCALAJS_VERSION="0.6.33"
14-
- TRAVIS_NODE_VERSION="14.3.0" SCALAJS_VERSION=""
13+
- TRAVIS_NODE_VERSION="14.3.0"
14+
- TRAVIS_NODE_VERSION="12.16.3"
15+
- TRAVIS_NODE_VERSION="10.20.1"
1516

1617
script:
17-
- sbt ++$TRAVIS_SCALA_VERSION test
18-
19-
jobs:
20-
include:
21-
- name: "Node.12 Scala.js 0.6"
22-
env: TRAVIS_NODE_VERSION="12.16.3" SCALAJS_VERSION="0.6.33"
23-
script: sbt ++$TRAVIS_SCALA_VERSION nodejs_v12/test nodejs_v10/test
24-
- name: "Node.12 Scala.js 1.x"
25-
env: TRAVIS_NODE_VERSION="12.16.3" SCALAJS_VERSION=""
26-
script: sbt ++$TRAVIS_SCALA_VERSION nodejs_v12/test nodejs_v10/test
27-
- name: "Node.10 Scala.js 0.6"
28-
env: TRAVIS_NODE_VERSION="10.20.1" SCALAJS_VERSION="0.6.33"
29-
script: sbt ++$TRAVIS_SCALA_VERSION nodejs_v10/test
30-
- name: "Node.10 Scala.js 1.x"
31-
env: TRAVIS_NODE_VERSION="10.20.1" SCALAJS_VERSION=""
32-
script: sbt ++$TRAVIS_SCALA_VERSION nodejs_v10/test
18+
- SCALAJS_VERSION="0.6.33" sbt ++$TRAVIS_SCALA_VERSION test
19+
- SCALAJS_VERSION="" sbt ++$TRAVIS_SCALA_VERSION test
3320

3421
install:
3522
- rm -rf ~/.nvm &&

build.sbt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
organization in ThisBuild := "net.exoego"
22

3-
lazy val root = (project in file("."))
4-
.aggregate(core, nodejs_v14, nodejs_v12, nodejs_v10)
5-
.settings(MySettings.commonSettings)
6-
.settings(MySettings.publishingSettings)
7-
.settings(MySettings.nonPublishingSetting)
8-
.settings(
9-
name := "scala-js-nodejs"
10-
)
3+
lazy val root = {
4+
val p = (project in file("."))
5+
.aggregate(core)
6+
.settings(MySettings.commonSettings)
7+
.settings(MySettings.publishingSettings)
8+
.settings(MySettings.nonPublishingSetting)
9+
.settings(
10+
name := "scala-js-nodejs"
11+
)
12+
val travisNodeVersion = Option(System.getenv("TRAVIS_NODE_VERSION")).filter(_.nonEmpty).getOrElse("")
13+
if (travisNodeVersion.startsWith("10.")) p.aggregate(nodejs_v10)
14+
else if (travisNodeVersion.startsWith("12.")) p.aggregate(nodejs_v10, nodejs_v12)
15+
else p.aggregate(nodejs_v10, nodejs_v12, nodejs_v14)
16+
}
1117

1218
lazy val core = (project in file("./core"))
1319
.enablePlugins(ScalaJSPlugin)

0 commit comments

Comments
 (0)