From 55a9836b78d76527bcbdc470aa72c808ac7f7765 Mon Sep 17 00:00:00 2001
From: Elia Schito <elia@schito.me>
Date: Fri, 15 Dec 2023 13:41:23 +0100
Subject: [PATCH 1/2] Add a missing YAML reference to the default database
 config

---
 core/lib/generators/spree/dummy/templates/rails/database.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lib/generators/spree/dummy/templates/rails/database.yml b/core/lib/generators/spree/dummy/templates/rails/database.yml
index 4462dcf8bdb..e6d7f7f340d 100644
--- a/core/lib/generators/spree/dummy/templates/rails/database.yml
+++ b/core/lib/generators/spree/dummy/templates/rails/database.yml
@@ -17,7 +17,7 @@
   db_username = ENV['DB_USERNAME']
   db_password = ENV['DB_PASSWORD'] %>
 
-default:
+default: &default
   adapter: <%= adapter %>
   <% unless db_username.blank? %>username: <%= db_username %><% end %>
   <% unless db_password.blank? %>password: <%= db_password %><% end %>

From 6eb9a56a6bac4398e7ca16e89fbebc91e2b90208 Mon Sep 17 00:00:00 2001
From: Elia Schito <elia@schito.me>
Date: Fri, 15 Dec 2023 15:44:53 +0100
Subject: [PATCH 2/2] Run installer CI jobs for PR targeting Solidus 4.2+

---
 .circleci/config.yml | 53 ++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2ab7964260f..34d5bd9e0c1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -269,33 +269,32 @@ jobs:
       ruby: "3.0"
     steps:
       - checkout
-      - when:
-          condition:
-            or:
-              - equal: [main, << pipeline.git.branch >>]
-              - equal: [v4.2, << pipeline.git.branch >>]
-          steps:
-            - libvips
-            - install_solidus:
-                flags: "--sample=false --frontend=starter --authentication=devise"
-            - test_page:
-                expected_text: "The only eCommerce platform you’ll ever need."
-            - run:
-                name: Ensure the correct PayPal is installed for SSF
-                command: |
-                  cd /tmp/my_app
-                  bundle list | grep 'solidus_paypal_commerce_platform (1.'
-            - install_solidus:
-                flags: "--sample=false --frontend=starter --authentication=devise --payment-method=stripe"
-            - test_page:
-                expected_text: "The only eCommerce platform you’ll ever need."
-            - install_dummy_app
-            - install_dummy_app:
-                extra_gems: "solidus_frontend"
-            - run:
-                name: "Ensure solidus_frontend installer is run"
-                command: |
-                  test -f /tmp/dummy_extension/spec/dummy/config/initializers/solidus_frontend.rb
+      - run:
+          name: "Skip for Solidus older than 4.2"
+          command: |
+            ruby -I. -rcore/lib/spree/core/version.rb -e "exit Spree.solidus_gem_version >= Gem::Version.new('4.2')" ||
+              circleci-agent step halt
+      - libvips
+      - install_solidus:
+          flags: "--sample=false --frontend=starter --authentication=devise"
+      - test_page:
+          expected_text: "The only eCommerce platform you’ll ever need."
+      - run:
+          name: Ensure the correct PayPal is installed for SSF
+          command: |
+            cd /tmp/my_app
+            bundle list | grep 'solidus_paypal_commerce_platform (1.'
+      - install_solidus:
+          flags: "--sample=false --frontend=starter --authentication=devise --payment-method=stripe"
+      - test_page:
+          expected_text: "The only eCommerce platform you’ll ever need."
+      - install_dummy_app
+      - install_dummy_app:
+          extra_gems: "solidus_frontend"
+      - run:
+          name: "Ensure solidus_frontend installer is run"
+          command: |
+            test -f /tmp/dummy_extension/spec/dummy/config/initializers/solidus_frontend.rb
 
   test_solidus:
     parameters: