Skip to content
This repository was archived by the owner on Nov 1, 2017. It is now read-only.

Update Travis configuration #938

Merged
merged 6 commits into from
Dec 22, 2015
Merged

Update Travis configuration #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4e672f
This line changed nothing.
gjtorikian Dec 22, 2015
9eaa24d
The call to `bootstrap` is unnecessary
gjtorikian Dec 22, 2015
e73b732
`cibuild` should just always set the test run to CI
gjtorikian Dec 22, 2015
d8e8a05
Enforce Travis to use `cibuild`
gjtorikian Dec 22, 2015
a0eb912
Don't run `bootstrap` if on Travis
gjtorikian Dec 22, 2015
c7201de
Cache the npm modules as well
gjtorikian Dec 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions script/cibuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions script/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
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