CI: debug

geobtaa · May 16, 2024 · c44fc70 · c44fc70
1 parent f96d302
commit c44fc70
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 40 deletions.
diff --git a/Gemfile b/Gemfile
@@ -41,35 +41,18 @@ else
   gem "geoblacklight", ">= 4.0"
   gem "statesman", ">= 3.4"
 
-  if ENV["RAILS_VERSION"]
-    if ENV["RAILS_VERSION"] == "edge"
-      gem "rails", github: "rails/rails"
-      ENV["ENGINE_CART_RAILS_OPTIONS"] = "--edge --skip-turbolinks"
-    else
-      gem "rails", ENV["RAILS_VERSION"]
-    end
-
-    case ENV["RAILS_VERSION"]
-    when /^6.0/
-      gem "sass-rails", ">= 6"
-    end
-  end
-end
-# END ENGINE_CART BLOCK
-# BEGIN ENGINE_CART BLOCK
-# engine_cart: 2.5.0
-# engine_cart stanza: 2.5.0
-# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path("Gemfile", ENV["ENGINE_CART_DESTINATION"] || ENV["RAILS_ROOT"] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
-if File.exist?(file)
-  begin
-    eval_gemfile file
-  rescue Bundler::GemfileError => e
-    Bundler.ui.warn "[EngineCart] Skipping Rails application dependencies:"
-    Bundler.ui.warn e.message
-  end
-else
-  Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
+  # GBL‡ADMIN
+  gem "active_storage_validations"
+  gem "awesome_print"
+  gem "blacklight_advanced_search"
+  gem "devise-bootstrap-views", "~> 1.0"
+  gem "devise_invitable", "~> 2.0.0"
+  gem "dotenv-rails"
+  gem "haml"
+  gem "inline_svg"
+  gem "kithe", "~> 2.0"
+  gem "noticed"
+  gem "paper_trail"
 
   if ENV["RAILS_VERSION"]
     if ENV["RAILS_VERSION"] == "edge"
@@ -85,4 +68,4 @@ else
     end
   end
 end
-# END ENGINE_CART BLOCK
+# END ENGINE_CART BLOCK
diff --git a/spec/test_app_templates/lib/generators/test_app_generator.rb b/spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -14,17 +14,17 @@ def add_gems
     gem "geoblacklight", ">= 4.0"
 
     # GBL‡ADMIN
-    gem 'active_storage_validations'
-    gem 'awesome_print'
-    gem 'blacklight_advanced_search'
-    gem 'devise-bootstrap-views', '~> 1.0'
+    gem "active_storage_validations"
+    gem "awesome_print"
+    gem "blacklight_advanced_search"
+    gem "devise-bootstrap-views", "~> 1.0"
     gem "devise_invitable", "~> 2.0.0"
-    gem 'dotenv-rails'
-    gem 'haml'
-    gem 'inline_svg'
-    gem 'kithe', '~> 2.0'
-    gem 'noticed'
-    gem 'paper_trail'
+    gem "dotenv-rails"
+    gem "haml"
+    gem "inline_svg"
+    gem "kithe", "~> 2.0"
+    gem "noticed"
+    gem "paper_trail"
 
     Bundler.with_unbundled_env do
       run "bundle install"