diff --git a/.travis.yml b/.travis.yml index 1bcd8421a8497e6f2462c9bb119625ecc15c03bd..697996c13a9d66b4928ad4489150e2947393f3d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/script/ci/build.sh b/script/ci/build.sh index 7a129f2118109a21d50aad47d2fcbe27b4cf8e93..d07e45c8ee4cdd8b3d4c15d564b55e319829a247 100755 --- a/script/ci/build.sh +++ b/script/ci/build.sh @@ -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