diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-05-31 12:37:20 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-05-31 12:37:20 +0100 |
| commit | 3470fd45294f439dd5175f506684631e4c47cebe (patch) | |
| tree | e24a8b5129f5ef9806f8e7efbd39e7a7ea99ff47 /script/rails-post-deploy | |
| parent | 57bfe1f4fd19f766677e08b132d0a16fad2ad706 (diff) | |
Revert "Revert "Let’s try fixing bundler instead""
This reverts commit 57bfe1f4fd19f766677e08b132d0a16fad2ad706.
In fact this time we are not going to try fixing bundler instead,
but rather we are going to try to work around the bundler bug in
a different way, by uploading our version of xapian-full to rubygems
(under a different name: xapian-full-alaveteli).
Diffstat (limited to 'script/rails-post-deploy')
| -rwxr-xr-x | script/rails-post-deploy | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/script/rails-post-deploy b/script/rails-post-deploy index a2761ecbc..193d0bbec 100755 --- a/script/rails-post-deploy +++ b/script/rails-post-deploy @@ -80,28 +80,7 @@ then bundle_install_options="--without development:test --deployment" fi -# Ordinarily we would expect simply to run "bundle install" here. -# However, at the time of writing there is a bug in bundler that -# causes gems from github to be rebuilt every time bundle install -# is run, which makes the process very extremely slow in our case -# because Xapian takes a long time to build. Running -# "bundle exec bundle install" is a workaround for this bug. -# -# However clearly one cannot run bundle exec till the bundle has -# initially been installed, so we use a flag file .bundler-has-run -# to indicate whether we are doing an initial install. -# -# If you ever need to rerun the initial install, just remove -# this flag file. -# -# https://groups.google.com/forum/?fromgroups#!topic/alaveteli-dev/lCDuW9H4uBI -if [ -e .bundler-has-run ] -then - bundle exec bundle install $bundle_install_options -else - bundle install $bundle_install_options - touch .bundler-has-run -fi +bundle install $bundle_install_options if [ -n "$OPTION_THEME_URLS" ] then |