Fix CI builds (lloydmeta#177)

Fix CI builds
bastewart · Mar 11, 2018 · 723bc53 · 723bc53
1 parent c895c32
commit 723bc53
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 14 deletions.
diff --git a/.travis-jvmopts b/.travis-jvmopts
@@ -0,0 +1,7 @@
+# This is used to configure the sbt instance that Travis launches
+
+-Xms2G
+-Xmx2G
+-Xss2M
+-XX:MaxMetaspaceSize=1G
+-Dfile.encoding=UTF-8
diff --git a/.travis.yml b/.travis.yml
@@ -1,26 +1,32 @@
 sudo: false
 language: scala
 
+env:
+  - SCALAJS_TEST_OPT=full
+
 # Only run aggregation 2.12
 matrix:
   include:
     - scala: 2.10.7
       jdk: oraclejdk8
       script:
-        - travis_wait travis_retry sbt ++$TRAVIS_SCALA_VERSION test:compile test:doc
-        - travis_wait travis_retry sbt ++$TRAVIS_SCALA_VERSION test
+        - sbt -jvm-opts .travis-jvmopts ++$TRAVIS_SCALA_VERSION  test:compile test:doc
+        - travis_wait 30 sleep 1800 &
+        - sbt -jvm-opts .travis-jvmopts ++$TRAVIS_SCALA_VERSION test
     - scala: 2.11.12
       jdk: oraclejdk8
       script:
-        - travis_wait travis_retry sbt ++$TRAVIS_SCALA_VERSION scalafmt::test test:compile test:doc
-        - travis_wait travis_retry sbt ++$TRAVIS_SCALA_VERSION test
+        - sbt -jvm-opts .travis-jvmopts ++$TRAVIS_SCALA_VERSION scalafmt::test test:compile test:doc
+        - travis_wait 30 sleep 1800 &
+        - sbt -jvm-opts .travis-jvmopts ++$TRAVIS_SCALA_VERSION test
     - scala: 2.12.4
       jdk: oraclejdk8
       script:
-        - travis_wait travis_retry sbt ++$TRAVIS_SCALA_VERSION test:compile test:doc
-        - travis_wait travis_retry sbt ++$TRAVIS_SCALA_VERSION coverage test coverageReport
-        - travis_wait travis_retry sbt ++$TRAVIS_SCALA_VERSION coverageAggregate
-      after_success: sbt ++$TRAVIS_SCALA_VERSION coveralls
+        - sbt -jvm-opts .travis-jvmopts ++$TRAVIS_SCALA_VERSION test:compile test:doc
+        - travis_wait 30 sleep 1800 &
+        - sbt -jvm-opts .travis-jvmopts ++$TRAVIS_SCALA_VERSION coverage test coverageReport
+        - sbt -jvm-opts .travis-jvmopts ++$TRAVIS_SCALA_VERSION coverageAggregate
+      after_success: sbt -jvm-opts .travis-jvmopts ++$TRAVIS_SCALA_VERSION coveralls
 cache:
   directories:
   - $HOME/.sbt/0.13

diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ lazy val theScalaVersion = "2.12.4"
 
 lazy val scalaVersions = Seq("2.10.7", "2.11.12", "2.12.4")
 
-lazy val scalaTestVersion  = "3.0.4"
+lazy val scalaTestVersion  = "3.0.5"
 lazy val scalacheckVersion = "1.13.5"
 
 // Library versions
@@ -382,6 +382,12 @@ lazy val ideSettings = Seq(
 )
 
 lazy val compilerSettings = Seq(
+  scalaJSStage in ThisBuild := {
+    sys.props.get("sbt.scalajs.testOpt").orElse(sys.env.get("SCALAJS_TEST_OPT")) match {
+      case Some("full") => FullOptStage
+      case _            => FastOptStage
+    }
+  },
   wartremoverErrors in (Compile, compile) ++= Warts.unsafe
     .filterNot(_ == Wart.DefaultArguments) :+ Wart.ExplicitImplicitTypes,
   scalacOptions in (Compile, compile) ++= {
@@ -472,8 +478,7 @@ val testSettings = {
       else
         originalValue
     },
-    doctestTestFramework := DoctestTestFramework.ScalaTest,
-    scalaJSStage in Test := FastOptStage
+    doctestTestFramework := DoctestTestFramework.ScalaTest
   )
 }
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.0.2
+sbt.version = 1.1.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -16,12 +16,12 @@ addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.2")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")
 
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27")
 
 addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.2.0")
 
-addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.7.0")
+addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.7.1")
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")