nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Use bundler 1.12.5 on travis"

Browse source 
This reverts commit 5fcc239d7c.
This commit is contained in:
Steffen van Bergerem 2016-09-12 10:51:07 +02:00
parent 56aec9a978
commit a3fd949df7
No known key found for this signature in database
GPG key ID: 2F08F75F9525C7E0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -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

2
script/ci/build.sh
View file

@ -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