Merge pull request #980 from gildegoma/travis-new-env

Use docker-based environment and dependency caching on Travis CI
spray · Feb 10, 2015 · 518eac9 · 518eac9
2 parents 5ab4fdf + ac00e39
commit 518eac9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/.jvmopts b/.jvmopts
@@ -1,7 +1,7 @@
 -Dfile.encoding=UTF8
 -XX:MaxPermSize=512m
 -Xms1g
--Xmx2g
+-Xmx3g
 -Xss2m
 -XX:+CMSClassUnloadingEnabled
 -XX:+UseConcMarkSweepGC
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,28 @@
+# use Docker-based container (instead of OpenVZ)
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.m2/repository
+    - $HOME/.sbt
+    - $HOME/.ivy2
+
 language: scala
+
 script: 
-  - sbt ++$TRAVIS_SCALA_VERSION 'set concurrentRestrictions in Global += Tags.limit(Tags.Compile, 2)' compile test:compile
+  - sbt ++$TRAVIS_SCALA_VERSION compile test:compile
   - sbt ++$TRAVIS_SCALA_VERSION -Dakka.test.timefactor=1.5 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)' test
+
+  # Trick to avoid unnecessary cache updates
+  - find $HOME/.sbt -name "*.lock" | xargs rm
+
 scala:
   - 2.10.3
+
 jdk:
   - oraclejdk7
   - openjdk7
+
 notifications:
   email:
     - johannes@spray.io