diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-05-06 11:40:19 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-05-06 11:40:19 +0100 |
| commit | 0e67b23bb8e3717c3817ada63fa3e677a7efe024 (patch) | |
| tree | c56d092a7d119e2b5e079ee07dee33c17a18c2d0 /script/rails-deploy-before-down | |
| parent | 9952e7cc50392dd5debdd73576e89dec12c4eb73 (diff) | |
| parent | 57adc3b1f49f38a3734854ddee417fa4674ee417 (diff) | |
Merge branch 'issues/762-travis-before-install' into rails-3-develop
Diffstat (limited to 'script/rails-deploy-before-down')
| -rwxr-xr-x | script/rails-deploy-before-down | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/script/rails-deploy-before-down b/script/rails-deploy-before-down index c157a8624..a5f0d7af0 100755 --- a/script/rails-deploy-before-down +++ b/script/rails-deploy-before-down @@ -135,13 +135,18 @@ if [ "$OPTION_STAGING_SITE" = "1" ] then bundle_install_options="$bundle_install_options" fi + +# Use script/wad to install bundle when on Travis if [ "$TRAVIS" = "true" ] then - bundle_install_options="--without development develop --deployment" + script/wad fi -echo "Running bundle install with options: $bundle_install_options" -bundle install $bundle_install_options +if [ ! "$TRAVIS" = "true" ] +then + echo "Running bundle install with options: $bundle_install_options" + bundle install $bundle_install_options +fi bundle exec rake submodules:check |