From 5759e31aeda6cdc5fce3151715aa248779634a66 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 22 Jun 2021 15:01:18 -0400 Subject: [PATCH] 17828: Remove bootsnap, which just seems to cause trouble Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- apps/workbench/Gemfile | 3 --- apps/workbench/Gemfile.lock | 6 +----- apps/workbench/config/boot.rb | 1 - services/api/Gemfile | 3 --- services/api/Gemfile.lock | 6 +----- services/api/config/boot.rb | 1 - 6 files changed, 2 insertions(+), 18 deletions(-) diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile index 239c24d950..46c1e8e60c 100644 --- a/apps/workbench/Gemfile +++ b/apps/workbench/Gemfile @@ -18,9 +18,6 @@ gem 'responders', '~> 2.0' # See: https://github.com/rails/sprockets-rails/issues/443 gem 'sprockets', '~> 3.0' -# Fast app boot times -gem 'bootsnap', require: false - # Note: keeping this out of the "group :assets" section "may" allow us # to use Coffescript for UJS responses. It also prevents a # warning/problem when running tests: "WARN: tilt autoloading diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock index 709e5eb3f6..178e5cdfe1 100644 --- a/apps/workbench/Gemfile.lock +++ b/apps/workbench/Gemfile.lock @@ -87,8 +87,6 @@ GEM multi_json (>= 1.0.0) autoprefixer-rails (9.5.1.1) execjs - bootsnap (1.4.7) - msgpack (~> 1.0) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) @@ -186,7 +184,6 @@ GEM metaclass (~> 0.0.1) morrisjs-rails (0.5.1.2) railties (> 3.1, < 6) - msgpack (1.3.3) multi_json (1.15.0) multipart-post (2.1.1) net-scp (2.0.0) @@ -333,7 +330,6 @@ DEPENDENCIES andand angularjs-rails (~> 1.3.8) arvados (~> 2.1.5) - bootsnap bootstrap-sass (~> 3.4.1) bootstrap-tab-history-rails bootstrap-x-editable-rails @@ -383,4 +379,4 @@ DEPENDENCIES uglifier (~> 2.0) BUNDLED WITH - 1.17.3 + 2.2.19 diff --git a/apps/workbench/config/boot.rb b/apps/workbench/config/boot.rb index 6add5911f6..8153266683 100644 --- a/apps/workbench/config/boot.rb +++ b/apps/workbench/config/boot.rb @@ -8,7 +8,6 @@ require 'rubygems' ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) -require 'bootsnap/setup' # Speed up boot time by caching expensive operations. # Use ARVADOS_API_TOKEN environment variable (if set) in console require 'rails' diff --git a/services/api/Gemfile b/services/api/Gemfile index ae16581236..7fc7f8757c 100644 --- a/services/api/Gemfile +++ b/services/api/Gemfile @@ -25,9 +25,6 @@ group :test, :development do gem 'listen' end -# Fast app boot times -gem 'bootsnap', require: false - gem 'pg', '~> 1.0' gem 'multi_json' diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 992ff39c09..7a3180d247 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -80,8 +80,6 @@ GEM addressable (>= 2.3.1) extlib (>= 0.9.15) multi_json (>= 1.0.0) - bootsnap (1.4.7) - msgpack (~> 1.0) builder (3.2.4) byebug (11.0.1) capistrano (2.15.9) @@ -149,7 +147,6 @@ GEM minitest (5.10.3) mocha (1.8.0) metaclass (~> 0.0.1) - msgpack (1.3.3) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) @@ -289,7 +286,6 @@ DEPENDENCIES acts_as_api andand arvados (~> 2.1.5) - bootsnap byebug factory_bot_rails httpclient @@ -325,4 +321,4 @@ DEPENDENCIES uglifier (~> 2.0) BUNDLED WITH - 1.17.3 + 2.2.19 diff --git a/services/api/config/boot.rb b/services/api/config/boot.rb index 9605b584e9..8087911837 100644 --- a/services/api/config/boot.rb +++ b/services/api/config/boot.rb @@ -6,4 +6,3 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) require 'bundler/setup' # Set up gems listed in the Gemfile. -require 'bootsnap/setup' # Speed up boot time by caching expensive operations. \ No newline at end of file -- 2.30.2