diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2021-03-18 10:26:11 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2021-03-18 10:35:51 -0700 |
| commit | 2d88d96b2cfeabd9eaa5350a1f8b90e54632923c (patch) | |
| tree | 5c86b235c9a011fdb5993f34ca91df3fedddea04 /habitat | |
| parent | 12265fccc388abe416d89e1f06df546d6b024747 (diff) | |
| download | chef-2d88d96b2cfeabd9eaa5350a1f8b90e54632923c.tar.gz | |
ruby 3.0 fixes and post-bundle-install hook
Mostly this is all fixes necessary for ruby 3.0
There's the addition of the appbundle hook which lets us better pull
git gems into appbundler
Note carefully how after adding the post-bundle-install.rb that
trying to pre appbundle-update ohai pulls in chef/chef as bundle
installed git gem which fails to install so we go back to only
using one appbundle-update on chef/chef and removing the chef/ohai
one (which may fix other bugs).
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'habitat')
| -rw-r--r-- | habitat/plan.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/habitat/plan.sh b/habitat/plan.sh index 64f424dfac..50868b1a3e 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -94,14 +94,10 @@ do_build() { ( cd "$CACHE_PATH" || exit_with "unable to enter hab-cache directory" 1 build_line "Installing gem dependencies ..." bundle install --jobs=3 --retry=3 + build_line "Installing gems from git repos properly ..." + ruby ./post-bundle-install.rb build_line "Installing this project's gems ..." bundle exec rake install - for gem in $GEM_HOME/bundler/gems/*; do - ( cd $gem - build_line "Installing gems from git repos properly ..." - rake install - ) - done ) } |