Commitdb4576f

committed

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

Update Travis configuration

2 parents594efae +c7201de commitdb4576fCopy full SHA for db4576f

File tree

+13

-6

lines changed

+13

-6

lines changed

Lines changed: 7 additions & 4 deletions

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ export RBENV_VERSION="2.2.3"`
`21`	`21`	`export RUBYLIB=`
`22`	`22`	`export RUBYOPT=`
`23`	`23`
	`24`	`+export CI="true"`
	`25`	`+`
`24`	`26`	`if [-d /usr/local/share/nodenv ];then`
`25`	`27`	`export NODENV_ROOT=/usr/local/share/nodenv`
`26`	`28`	`export PATH=/usr/local/share/nodenv/bin:/usr/local/share/nodenv/shims:$PATH`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,13 @@ export RACK_ROOT=$(cd "$(dirname $0)"/.. && pwd)`
`13`	`13`
`14`	`14`	`export RAILS_ENV="test" RACK_ENV="test"`
`15`	`15`
`16`		`-script/bootstrap`
	`16`	`+if [-z"$TRAVIS" ];then`
	`17`	`+ script/bootstrap`
	`18`	`+fi`
`17`	`19`
`18`	`20`	`echo"===> Running tests..."`
`19`	`21`
`20`		`-if [-n"$JANKY_ID" ];then`
	`22`	`+if [-n"$CI" ];then`
`21`	`23`	`xvfb-run -a bundleexec raketest`
`22`	`24`	`else`
`23`	`25`	`bundleexec raketest`

Comments

(0)