Merge pull request github#938 from github/update-travis-config

gjtorikian · gjtorikian · commit db4576fcd714 · 2015-12-22T00:37:24.000-06:00
Update Travis configuration
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,13 @@
 language: ruby
 rvm:
   - 2.2.3
-before_script:
-  - script/bootstrap
-  - sh -e /etc/init.d/xvfb start
-cache: bundler
+cache:
+  directories:
+    - vendor/bundle
+    - node_modules
 sudo: false
 git:
   depth: 10
+script:
+  - npm install
+  - script/cibuild
diff --git a/script/cibuild b/script/cibuild
@@ -21,6 +21,8 @@ export RBENV_VERSION="2.2.3"
 export RUBYLIB=
 export RUBYOPT=
 
+export CI="true"
+
 if [ -d /usr/local/share/nodenv ]; then
   export NODENV_ROOT=/usr/local/share/nodenv
   export PATH=/usr/local/share/nodenv/bin:/usr/local/share/nodenv/shims:$PATH
diff --git a/script/test b/script/test
@@ -13,11 +13,13 @@ export RACK_ROOT=$(cd "$(dirname $0)"/.. && pwd)
 
 export RAILS_ENV="test" RACK_ENV="test"
 
-script/bootstrap
+if [ -z "$TRAVIS" ]; then
+  script/bootstrap
+fi
 
 echo "===> Running tests..."
 
-if [ -n "$JANKY_ID" ]; then
+if [ -n "$CI" ]; then
   xvfb-run -a bundle exec rake test
 else
   bundle exec rake test
