diff options
| author | Benjamin Neff <benjamin@coding4coffee.ch> | 2017-10-29 19:33:26 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2017-11-01 02:45:22 +0300 |
| commit | 4e267bb1efdd0a295c3b6909f74cf9c60b6856a4 (patch) | |
| tree | 4576c0fd3ec8039d2f78d87742d8aa79f1e3e177 /script | |
| parent | a14115119c643c00f19366be94251ded1be6ec32 (diff) | |
Use configure_bundler script on travis
Diffstat (limited to 'script')
| -rwxr-xr-x | script/ci/build.sh | 8 | ||||
| -rwxr-xr-x | script/ci/prepare.sh | 11 |
2 files changed, 11 insertions, 8 deletions
diff --git a/script/ci/build.sh b/script/ci/build.sh index 7a129f211..376917c83 100755 --- a/script/ci/build.sh +++ b/script/ci/build.sh @@ -1,13 +1,5 @@ #!/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 diff --git a/script/ci/prepare.sh b/script/ci/prepare.sh new file mode 100755 index 000000000..6bd574ba4 --- /dev/null +++ b/script/ci/prepare.sh @@ -0,0 +1,11 @@ +#!/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 |