diff --git a/.travis.yml b/.travis.yml index 4529fb2c6..6af7b9a29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,26 +10,13 @@ jdk: env: matrix: - - TRAVIS_NODE_VERSION="14.3.0" SCALAJS_VERSION="0.6.33" - - TRAVIS_NODE_VERSION="14.3.0" SCALAJS_VERSION="" + - TRAVIS_NODE_VERSION="14.3.0" + - TRAVIS_NODE_VERSION="12.16.3" + - TRAVIS_NODE_VERSION="10.20.1" script: - - sbt ++$TRAVIS_SCALA_VERSION test - -jobs: - include: - - name: "Node.12 Scala.js 0.6" - env: TRAVIS_NODE_VERSION="12.16.3" SCALAJS_VERSION="0.6.33" - script: sbt ++$TRAVIS_SCALA_VERSION nodejs_v12/test nodejs_v10/test - - name: "Node.12 Scala.js 1.x" - env: TRAVIS_NODE_VERSION="12.16.3" SCALAJS_VERSION="" - script: sbt ++$TRAVIS_SCALA_VERSION nodejs_v12/test nodejs_v10/test - - name: "Node.10 Scala.js 0.6" - env: TRAVIS_NODE_VERSION="10.20.1" SCALAJS_VERSION="0.6.33" - script: sbt ++$TRAVIS_SCALA_VERSION nodejs_v10/test - - name: "Node.10 Scala.js 1.x" - env: TRAVIS_NODE_VERSION="10.20.1" SCALAJS_VERSION="" - script: sbt ++$TRAVIS_SCALA_VERSION nodejs_v10/test + - SCALAJS_VERSION="0.6.33" sbt ++$TRAVIS_SCALA_VERSION test + - SCALAJS_VERSION="" sbt ++$TRAVIS_SCALA_VERSION test install: - rm -rf ~/.nvm && diff --git a/build.sbt b/build.sbt index cdb72729e..826c602bc 100644 --- a/build.sbt +++ b/build.sbt @@ -1,13 +1,19 @@ organization in ThisBuild := "net.exoego" -lazy val root = (project in file(".")) - .aggregate(core, nodejs_v14, nodejs_v12, nodejs_v10) - .settings(MySettings.commonSettings) - .settings(MySettings.publishingSettings) - .settings(MySettings.nonPublishingSetting) - .settings( - name := "scala-js-nodejs" - ) +lazy val root = { + val p = (project in file(".")) + .aggregate(core) + .settings(MySettings.commonSettings) + .settings(MySettings.publishingSettings) + .settings(MySettings.nonPublishingSetting) + .settings( + name := "scala-js-nodejs" + ) + val travisNodeVersion = Option(System.getenv("TRAVIS_NODE_VERSION")).filter(_.nonEmpty).getOrElse("") + if (travisNodeVersion.startsWith("10.")) p.aggregate(nodejs_v10) + else if (travisNodeVersion.startsWith("12.")) p.aggregate(nodejs_v10, nodejs_v12) + else p.aggregate(nodejs_v10, nodejs_v12, nodejs_v14) +} lazy val core = (project in file("./core")) .enablePlugins(ScalaJSPlugin)