parent
f0e70a3c6c
commit
5fcc239d7c
2 changed files with 2 additions and 2 deletions
|
|
@ -23,7 +23,7 @@ branches:
|
|||
- 'develop'
|
||||
|
||||
before_install:
|
||||
- gem install bundler
|
||||
- gem install bundler --version 1.12.5
|
||||
- mkdir travis-phantomjs
|
||||
- wget http://cifiles.diasporafoundation.org/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
|
||||
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ if [ "$DB" = "mysql" ]; then
|
|||
sed -i 's/*common/*mysql/' config/database.yml
|
||||
fi
|
||||
|
||||
command="bundle exec rake --trace ci:travis:${BUILD_TYPE}"
|
||||
command="bundle _1.12.5_ exec rake --trace ci:travis:${BUILD_TYPE}"
|
||||
|
||||
exec xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1280x1024x8" $command
|
||||
|
|
|
|||
Loading…
Reference in a new issue