Commit 4e267bb1 authored by Benjamin Neff's avatar Benjamin Neff

Use configure_bundler script on travis

parent a1411511
......@@ -24,14 +24,12 @@ branches:
- 'develop'
before_install:
- gem install bundler
- script/ci/prepare.sh
- 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
- export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
bundler_args: "--deployment --without development --with mysql postgresql --jobs 3 --retry 3"
script: "./script/ci/build.sh"
notifications:
......
#!/bin/sh
# Create a database.yml for the right database
echo "Setting up database.yml for $DB"
cp config/database.yml.example config/database.yml
if [ "$DB" = "mysql" ]; then
sed -i 's/*common/*mysql/' config/database.yml
fi
command="bundle exec rake --trace ci:travis:${BUILD_TYPE}"
exec xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1280x1024x8" $command
#!/bin/sh
# Create a database.yml for the right database
echo "Setting up database.yml for ${DB}"
cp config/database.yml.example config/database.yml
if [ "${DB}" = "mysql" ]; then
sed -i 's/*common/*mysql/' config/database.yml
fi
gem install bundler
script/configure_bundler
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