From 57005fd0ff6d05167e0cce2795a2c3352497c9ab Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Mon, 10 Mar 2014 10:14:41 +0000 Subject: Allow the location of the bundle to be configured - Sets vendor/bundle as default - Uses $HOME/bundle when generating general.yml Based on d9f162c8ab08cb881cd68a3eee900c52c63cb1ae --- script/rails-deploy-before-down | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'script/rails-deploy-before-down') diff --git a/script/rails-deploy-before-down b/script/rails-deploy-before-down index ad1049e44..c157a8624 100755 --- a/script/rails-deploy-before-down +++ b/script/rails-deploy-before-down @@ -123,19 +123,24 @@ END echo "ENV['RAILS_ENV'] ||= 'production'" > config/rails_env.rb fi -bundle_install_options="" +BUNDLE_PATH="${OPTION_BUNDLE_PATH:-vendor/bundle}" + +bundle_install_options="--path $BUNDLE_PATH" + if [ "$OPTION_STAGING_SITE" = "0" ] then - bundle_install_options="--without development:test --deployment" + bundle_install_options="$bundle_install_options --without development:test --deployment" fi if [ "$OPTION_STAGING_SITE" = "1" ] then - bundle_install_options="--path vendor/bundle" + bundle_install_options="$bundle_install_options" fi if [ "$TRAVIS" = "true" ] then bundle_install_options="--without development develop --deployment" fi + +echo "Running bundle install with options: $bundle_install_options" bundle install $bundle_install_options bundle exec rake submodules:check -- cgit v1.2.3 From effa1ff12e8d1bdf83a6b67270dadfb6ce86876f Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Fri, 25 Apr 2014 12:01:52 +0100 Subject: Use WAD to cache bundles to Amazon S3 https://github.com/Fingertips/WAD --- script/rails-deploy-before-down | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'script/rails-deploy-before-down') 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 -- cgit v1.2.3 From e68e491333630ed096405747e63e8bf66897b246 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Fri, 25 Apr 2014 12:31:06 +0100 Subject: Rename develop Gemfile group to debug Develop is too similar to development to mean anything different. --- script/rails-deploy-before-down | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'script/rails-deploy-before-down') diff --git a/script/rails-deploy-before-down b/script/rails-deploy-before-down index a5f0d7af0..42284b00d 100755 --- a/script/rails-deploy-before-down +++ b/script/rails-deploy-before-down @@ -129,7 +129,7 @@ bundle_install_options="--path $BUNDLE_PATH" if [ "$OPTION_STAGING_SITE" = "0" ] then - bundle_install_options="$bundle_install_options --without development:test --deployment" + bundle_install_options="$bundle_install_options --without development debug test --deployment" fi if [ "$OPTION_STAGING_SITE" = "1" ] then -- cgit v1.2.3