[arvados] created: 2.7.0-6259-gb4f40934a6
git repository hosting
git at public.arvados.org
Fri Mar 29 13:41:00 UTC 2024
at b4f40934a6b7cf80895be7936af64a755cfda81b (commit)
commit b4f40934a6b7cf80895be7936af64a755cfda81b
Author: Brett Smith <brett.smith at curii.com>
Date: Thu Mar 14 11:17:24 2024 -0400
21583: Override base64 dependency so it doesn't appear in Gemfile.lock
See comments and linked bug for rationale.
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 9cc5f1b7bc..473d1e9169 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -58,6 +58,28 @@ gem 'webrick'
gem 'mini_portile2', '~> 2.8', '>= 2.8.1'
+# If we're running on Ruby 2.x, we'll go down the `else` branch below.
+plugin 'bundler-override' if RUBY_VERSION >= "3.0"
+if bundler_override_paths = Bundler::Plugin.index.load_paths("bundler-override")
+ require File.join(bundler_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
+ # The plugin is not available, either because Ruby is too old or Bundler
+ # is installing it this run. That's fine as long as Bundler isn't updating
+ # Gemfile.lock. Unfortunately we can't know that for sure here, because
+ # bundler needs to read Gemfile in order to figure out whether it's going
+ # to update Gemfile.lock. Flagging the situation for the user is the best
+ # we can do.
+ Bundler.ui.warn("bundler-override plugin not available - do NOT commit any changes to Gemfile.lock")
+end
+
# Install any plugin gems
Dir.glob(File.join(File.dirname(__FILE__), 'lib', '**', "Gemfile")) do |f|
eval(IO.read(f), binding)
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 003b886cee..4adb27dff5 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -104,7 +104,6 @@ GEM
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
- base64 (0.2.0)
builder (3.2.4)
byebug (11.1.3)
concurrent-ruby (1.2.3)
@@ -119,7 +118,6 @@ GEM
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faraday (2.8.1)
- base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-gzip (2.0.1)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list