From e4e672f334598844662ffe0763582290dbc18d9a Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Mon, 21 Dec 2015 23:48:53 -0600 Subject: [PATCH 1/6] This line changed nothing. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8e00770d23..a2b65fd6cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ rvm: - 2.2.3 before_script: - script/bootstrap - - sh -e /etc/init.d/xvfb start cache: bundler sudo: false git: From 9eaa24d2c87bd4d6c0bcf2f11bb3a35d9e706fb1 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Mon, 21 Dec 2015 23:49:10 -0600 Subject: [PATCH 2/6] The call to `bootstrap` is unnecessary This also conflicts with Travis' caching of gems. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2b65fd6cb..7d4eab805f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: ruby rvm: - 2.2.3 -before_script: - - script/bootstrap cache: bundler sudo: false git: From e73b7328888439cee522f44491eb0c7c37ccc0ea Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Mon, 21 Dec 2015 23:52:00 -0600 Subject: [PATCH 3/6] `cibuild` should just always set the test run to CI This makes much more sense given that Janky/Travis both route through `cibuild`. --- script/cibuild | 2 ++ script/test | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index 7bfbc3d2fa..7ca9a56758 100755 --- 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 index 3315bee8de..4896564440 100755 --- a/script/test +++ b/script/test @@ -17,7 +17,7 @@ script/bootstrap echo "===> Running tests..." -if [ -n "$JANKY_ID" ]; then +if [ -n "$CI" ]; then xvfb-run -a bundle exec rake test else bundle exec rake test From d8e8a0586e084a01dd9b91b2d9e2c047537c2975 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Mon, 21 Dec 2015 23:52:26 -0600 Subject: [PATCH 4/6] Enforce Travis to use `cibuild` This configures the necessary `xvfb-run -a` command --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7d4eab805f..09cc8e81a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,5 @@ cache: bundler sudo: false git: depth: 10 +script: + - script/cibuild From a0eb91235bae998b85a466cd6a39173b6a2121d1 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Mon, 21 Dec 2015 23:56:29 -0600 Subject: [PATCH 5/6] Don't run `bootstrap` if on Travis MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This conflicts with Travis’ own caching strategy --- script/test | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/test b/script/test index 4896564440..33ec86545e 100755 --- a/script/test +++ b/script/test @@ -13,7 +13,9 @@ 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..." From c7201de99318e78e5431da0810b746e36f442c1c Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Mon, 21 Dec 2015 23:59:37 -0600 Subject: [PATCH 6/6] Cache the npm modules as well --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 09cc8e81a5..00e5561e87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,13 @@ language: ruby rvm: - 2.2.3 -cache: bundler +cache: + directories: + - vendor/bundle + - node_modules sudo: false git: depth: 10 script: + - npm install - script/cibuild pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy