[arvados] updated: 2.7.0-6196-g3fd6901012

[git repository hosting]

Summary of changes:
 services/api/Gemfile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

       via  3fd690101288dc2f80c3faf31a31f70182d3b07b (commit)
      from  89e933a09d0f1de3604517bec6fbd055a0bb47b8 (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 3fd690101288dc2f80c3faf31a31f70182d3b07b
Author: Brett Smith <brett.smith at curii.com>
Date:   Thu Mar 14 12:28:32 2024 -0400

    21583: Don't strictly require bundler-override plugin
    
    This is mainly an attempt to avoid breaking our existing build and test
    infrastructure. None of that tooling is expected to change Gemfile.lock,
    so in those non-development scenarios it's okay if the plugin isn't
    available.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/services/api/Gemfile b/services/api/Gemfile
index eb05100954..ff130c2684 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -59,15 +59,19 @@ gem 'webrick'
 gem 'mini_portile2', '~> 2.8', '>= 2.8.1'
 
 plugin 'bundler-override'
-require File.join(Bundler::Plugin.index.load_paths("bundler-override")[0], "bundler-override") rescue nil
-# Ruby 3.4 drops base64 as a default gem. Because of this, various other gems
-# are starting to declare base64 as a dependency. However, locking one
-# specific version of base64 makes it more difficult to support older Rubies
-# that still have it as a default. See <https://dev.arvados.org/issues/21583>.
-# Because we are focused on supporting distros with those older Rubies, we
-# drop base64 dependencies here. These overrides can go away once we shift to
-# supporting Ruby 3.4+.
-override 'faraday', drop: ['base64']
+if override_paths = Bundler::Plugin.index.load_paths("bundler-override")
+  require File.join(override_paths[0], "bundler-override")
+  # Ruby 3.4 drops base64 as a default gem. Because of this, various other gems
+  # are starting to declare base64 as a dependency. However, locking one
+  # specific version of base64 makes it more difficult to support older Rubies
+  # that still have it as a default. See <https://dev.arvados.org/issues/21583>.
+  # Because we are focused on supporting distros with those older Rubies, we
+  # drop base64 dependencies here. These overrides can go away once we shift to
+  # supporting Ruby 3.4+.
+  override 'faraday', drop: ['base64']
+else
+  Warning.warn("bundler-override plugin not available - any changes to Gemfile.lock may be inaccurate\n")
+end
 
 # Install any plugin gems
 Dir.glob(File.join(File.dirname(__FILE__), 'lib', '**', "Gemfile")) do |f|

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


hooks/post-receive
--