[arvados] updated: 2.7.0-6456-gbfb1c2befc

git repository hosting git at public.arvados.org
Tue Apr 23 13:27:06 UTC 2024


Summary of changes:
 build/rails-package-scripts/postinst.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

       via  bfb1c2befc24e5706ac2917e723aaf93638df886 (commit)
      from  8b91442e262317e7760554b4bf0b6d7ef8fd30d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit bfb1c2befc24e5706ac2917e723aaf93638df886
Author: Brett Smith <brett.smith at curii.com>
Date:   Tue Apr 23 09:25:59 2024 -0400

    21700: Set GEM_PATH in Rails postinst
    
    This is necessary to get the desired behavior in Ruby 2.7. Otherwise
    Bundler gets installed somewhere else.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/rails-package-scripts/postinst.sh b/build/rails-package-scripts/postinst.sh
index 77bc08052a..1d426baa73 100644
--- a/build/rails-package-scripts/postinst.sh
+++ b/build/rails-package-scripts/postinst.sh
@@ -200,6 +200,7 @@ configure_version() {
   # 3. We can know exactly where the `bundle` command got installed.
   local bundle_path="$SHARED_PATH/vendor_bundle"
   export GEM_HOME="$bundle_path/ruby/$(ruby -e 'puts RUBY_VERSION')"
+  export GEM_PATH="$GEM_HOME"
   run_and_report "Installing bundler" gem install --conservative --version '~> 2.4.0' bundler
   local bundle="$GEM_HOME/bin/bundle"
 
@@ -213,8 +214,8 @@ configure_version() {
       | run_and_report "Installing bundle gems" xargs -0r \
                        gem install --conservative --ignore-dependencies --local --quiet
   # The earlier `bundle config` should have it looking for installed gems in
-  # the right place. Unset GEM_HOME now to be sure.
-  unset GEM_HOME
+  # the right place. Unset GEM_* now to be sure.
+  unset GEM_HOME GEM_PATH
   run_and_report "Running bundle install" "$bundle" install --prefer-local --quiet
   run_and_report "Verifying bundle is complete" "$bundle" exec true
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list