summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2015-07-15 09:04:24 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-07-15 09:04:24 -0700
commit8f8d78e91e5478c288a49485467314e886f01e84 (patch)
tree7aa7051fceefbefac16f114902a9a49677f01979
parent52fde52920d93325310e5544991feeea03e5c763 (diff)
parent3c15fda6ba51ae74078a1eb454c73caa42ee56c7 (diff)
downloadscala-8f8d78e91e5478c288a49485467314e886f01e84.tar.gz
scala-8f8d78e91e5478c288a49485467314e886f01e84.tar.bz2
scala-8f8d78e91e5478c288a49485467314e886f01e84.zip
Merge pull request #4634 from SethTisue/travis-container-infrastructure
opt-in to Travis's newer/faster container-based infrastructure
-rw-r--r--.travis.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 6a7ac45e3d..236e002a5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+# opt-in to Travis's newer/faster container-based infrastructure
+sudo: false
+
# this builds the spec using jekyll
# based on http://www.paperplanes.de/2013/8/13/deploying-your-jekyll-blog-to-s3-with-travis-ci.html
language: ruby
@@ -17,4 +20,4 @@ after_success:
- openssl aes-256-cbc -pass "pass:$PRIV_KEY_SECRET" -in spec/id_dsa_travis.enc -out spec/id_dsa_travis -d -a
- chmod 600 spec/id_dsa_travis
- eval "$(ssh-agent)"
- - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ssh-add -D && ssh-add spec/id_dsa_travis && rsync -e "ssh -o StrictHostKeyChecking=no" -rzv build/spec/ scalatest@chara.epfl.ch:/home/linuxsoft/archives/scala/spec/2.11/' \ No newline at end of file
+ - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ssh-add -D && ssh-add spec/id_dsa_travis && rsync -e "ssh -o StrictHostKeyChecking=no" -rzv build/spec/ scalatest@chara.epfl.ch:/home/linuxsoft/archives/scala/spec/2.11/'