Revert "Use bundler 1.12.5 on travis"

This reverts commit 5fcc239d.
parent 56aec9a9
...@@ -23,7 +23,7 @@ branches: ...@@ -23,7 +23,7 @@ branches:
- 'develop' - 'develop'
before_install: before_install:
- gem install bundler --version 1.12.5 - gem install bundler
- mkdir travis-phantomjs - 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 - 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 - 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 ...@@ -8,6 +8,6 @@ if [ "$DB" = "mysql" ]; then
sed -i 's/*common/*mysql/' config/database.yml sed -i 's/*common/*mysql/' config/database.yml
fi fi
command="bundle _1.12.5_ exec rake --trace ci:travis:${BUILD_TYPE}" command="bundle exec rake --trace ci:travis:${BUILD_TYPE}"
exec xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1280x1024x8" $command exec xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1280x1024x8" $command
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment