[pull] main from solidusio:main

.circleci/config.yml

@@ -9,7 +9,7 @@ executors:
     parameters: &parameters
       ruby:
         type: string
-        default: "3.0"
+        default: "3.1"
     working_directory: &workdir ~/solidus
     environment: &environment
       DEFAULT_MAX_WAIT_TIME: 10
@@ -59,9 +59,7 @@ commands:
   setup:
     steps:
       - checkout
-      - browser-tools/install-chrome:
-          chrome-version: "118.0.5993.70"
-          replace-existing: true
+      - browser-tools/install-chrome
       - run:
           name: Check chrome version
           command: |
@@ -120,6 +118,9 @@ commands:
       - run:
           name: "Run Legacy Promotion Tests"
           command: ./bin/build-ci legacy_promotions
+      - run:
+          name: "Run Friendly Promotion Tests"
+          command: ./bin/build-ci promotions
 
       - store_artifacts:
           path: /tmp/test-artifacts
@@ -159,23 +160,23 @@ commands:
             ruby -v >> /tmp/.ruby-versions
             gem --version >> /tmp/.gems-versions
             bundle --version >> /tmp/.gems-versions
-            gem search -eq rails -v "~> 7" -v "< 7.2" >> /tmp/.gems-versions # get the latest rails from rubygems
+            gem search -eq rails -v "~> 7" -v "< 8.0" >> /tmp/.gems-versions # get the latest rails from rubygems
             gem search -eq solidus >> /tmp/.gems-versions # get the latest solidus from rubygems
 
             cat /tmp/.ruby-versions
             cat /tmp/.gems-versions
       - restore_cache:
           keys:
-            - solidus-installer-v9-{{ checksum "/tmp/.ruby-versions" }}-{{ checksum "/tmp/.gems-versions" }}
-            - solidus-installer-v9-{{ checksum "/tmp/.ruby-versions" }}-
+            - solidus-installer-v11-{{ checksum "/tmp/.ruby-versions" }}-{{ checksum "/tmp/.gems-versions" }}
+            - solidus-installer-v11-{{ checksum "/tmp/.ruby-versions" }}-
       - run:
           name: "Prepare the rails application"
           command: |
             cd /tmp
-            test -d my_app || (gem install rails -v "< 7.1" && gem install solidus)
+            test -d my_app || (gem install rails -v "< 8.0" && gem install solidus)
             test -d my_app || rails new my_app --skip-git
       - save_cache:
-          key: solidus-installer-v9-{{ checksum "/tmp/.ruby-versions" }}-{{ checksum "/tmp/.gems-versions" }}
+          key: solidus-installer-v11-{{ checksum "/tmp/.ruby-versions" }}-{{ checksum "/tmp/.gems-versions" }}
           paths:
             - /tmp/my_app
             - /home/circleci/.rubygems
@@ -191,10 +192,10 @@ commands:
     parameters:
       app_root:
         type: string
-        default: '/tmp/my_app'
+        default: "/tmp/my_app"
       path:
         type: string
-        default: '/'
+        default: "/"
       expected_text:
         type: string
 
@@ -223,39 +224,18 @@ commands:
             mkdir -p /tmp/dummy_extension
             cd /tmp/dummy_extension
             bundle init
-            bundle add rails -v "< 7.1" --skip-install
-            bundle add sqlite3 -v "~> 1.3" --skip-install
+            bundle add rails -v "< 8.0" --skip-install
+            bundle add sqlite3 -v "~> 2.0" --skip-install
             test -n "<<parameters.extra_gems>>" && bundle add <<parameters.extra_gems>> --skip-install
             bundle add solidus --path "$(ruby -e"puts File.expand_path ENV['CIRCLE_WORKING_DIRECTORY']")"
             export LIB_NAME=set # dummy requireable file
             bundle exec rake -rrails -rspree/testing_support/extension_rake -e'Rake::Task["extension:test_app"].invoke'
 
 jobs:
-  lint_code:
-    docker:
-      - image: cimg/ruby:3.2-node
-        environment:
-          BUNDLE_ONLY: "lint"
-          ESLINT_USE_FLAT_CONFIG: false
-    steps:
-      - checkout
-      - run: 'bundle install'
-      - run:
-          name: Check Ruby
-          command: "bin/rake lint:rb"
-      - run:
-          name: Check ERB
-          command: "bin/rake lint:erb"
-      - run:
-          name: Check JavaScript
-          command: "bin/rake lint:js"
-      - store_test_results:
-          path: test-results
-
   solidus_installer:
     executor:
       name: sqlite
-      ruby: "3.0"
+      ruby: "3.1"
     steps:
       - checkout
       - run:
@@ -278,12 +258,10 @@ jobs:
       - test_page:
           expected_text: "<title>Sample Store</title>"
       - install_dummy_app
-      - install_dummy_app:
-          extra_gems: "solidus_frontend"
       - run:
-          name: "Ensure solidus_frontend installer is run"
+          name: "Ensure extension test app is created"
           command: |
-            test -f /tmp/dummy_extension/spec/dummy/config/initializers/solidus_frontend.rb
+            test -d /tmp/dummy_extension/spec/dummy
 
   test_solidus:
     parameters:
@@ -292,7 +270,7 @@ jobs:
         default: postgres
       ruby:
         type: string
-        default: '3.2'
+        default: "3.2"
       rails:
         type: string
         default: "7.1"
@@ -328,28 +306,28 @@ jobs:
         default: postgres
       ruby:
         type: string
-        default: '3.2'
+        default: "3.2"
     executor:
       name: << parameters.database >>
       ruby: << parameters.ruby >>
     parallelism: 3
     environment:
-      COVERAGE: 'true'
+      COVERAGE: "true"
       COVERAGE_DIR: /tmp/coverage
       DISABLE_ACTIVE_STORAGE: false
     steps:
       - setup
       - run:
           name: Setup Coverage Env Vars
           command: |
-              echo 'export COVERAGE_FILE=/tmp/coverage/coverage.xml' >> $BASH_ENV
-              source $BASH_ENV
+            echo 'export COVERAGE_FILE=/tmp/coverage/coverage.xml' >> $BASH_ENV
+            source $BASH_ENV
       - run:
           name: Verify Coverage Env Vars
           command: |
-              echo $COVERAGE
-              echo /tmp/coverage
-              echo /tmp/coverage/coverage.xml
+            echo $COVERAGE
+            echo /tmp/coverage
+            echo /tmp/coverage/coverage.xml
       - run:
           name: Setup Coverage Directory
           command: mkdir -p /tmp/coverage
@@ -363,21 +341,56 @@ jobs:
 workflows:
   build:
     jobs:
-      - lint_code
       - solidus_installer
       - test_solidus_with_coverage # Only test with coverage support with the default versions
 
       # Based on supported versions for the current Solidus release and recommended versions from
       # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html.
       - test_solidus:
           name: &name "test-rails-<<matrix.rails>>-ruby-<<matrix.ruby>>-<<matrix.database>>-<<#matrix.paperclip>>paperclip<</matrix.paperclip>><<^matrix.paperclip>>activestorage<</matrix.paperclip>>"
-          matrix: { parameters: { rails: ['7.0', '7.1'], ruby: ['3.0'], database: ['mysql'], paperclip: [true] } }
+          matrix:
+            {
+              parameters:
+                {
+                  rails: ["7.0", "7.1", "7.2"],
+                  ruby: ["3.1"],
+                  database: ["mysql"],
+                  paperclip: [true],
+                },
+            }
       - test_solidus:
           name: *name
-          matrix: { parameters: { rails: ['7.0', '7.1'], ruby: ['3.1'], database: ['postgres'], paperclip: [false] } }
+          matrix:
+            {
+              parameters:
+                {
+                  rails: ["7.0", "7.1", "7.2"],
+                  ruby: ["3.1"],
+                  database: ["postgres"],
+                  paperclip: [false],
+                },
+            }
       - test_solidus:
           name: *name
-          matrix: { parameters: { rails: ['7.0'], ruby: ['3.2'], database: ['sqlite'], paperclip: [false] } }
+          matrix:
+            {
+              parameters:
+                {
+                  rails: ["7.1"],
+                  ruby: ["3.2"],
+                  database: ["sqlite"],
+                  paperclip: [false],
+                },
+            }
       - test_solidus:
           name: *name
-          matrix: { parameters: { rails: ['7.1', 'main'], ruby: ['3.3'], database: ['sqlite'], paperclip: [false] } }
+          matrix:
+            {
+              parameters:
+                {
+                  rails: ["7.2", "main"],
+                  ruby: ["3.3.5"],
+                  database: ["sqlite"],
+                  paperclip: [false],
+                },
+            }

.git-blame-ignore-revs

@@ -3,3 +3,7 @@
 989ba2e74e49332d2281187d09a2dc7aad75922a
 # Rubocop auto (Mar 8, 2018)
 b3007bb0973dcb987b0328b4e59306cd2549148d
+# Autocorrect circle/config.yml with prettier (Sep 12, 2024)
+c636624093fec55e38f14cade4dee4ec0a829802
+# Rubocop: Autocorrect (Sep 12, 2024)
+273e5bd54e2b1783206043e316c2de4c9e95eb45

.github/labeler.yml

@@ -1,45 +1,57 @@
 "changelog:solidus_core":
 - any:
-  - changed_files:
+  - changed-files:
     - any-glob-to-any-file:
       - "core/**/*"
 "changelog:solidus_backend":
 - any:
-  - changed_files:
+  - changed-files:
     - any-glob-to-any-file:
       - "backend/**/*"
 "changelog:solidus_api":
 - any:
-  - changed_files:
+  - changed-files:
     - any-glob-to-any-file:
       - "api/**/*"
 "changelog:solidus_admin":
 - any:
-  - changed_files:
+  - changed-files:
     - any-glob-to-any-file:
       - "admin/**/*"
+"changelog:solidus_promotions":
+- any:
+  - changed-files:
+    - any-glob-to-any-file:
+      - "promotions/**/*"
+"changelog:solidus_legacy_promotions":
+- any:
+  - changed-files:
+    - any-glob-to-any-file:
+      - "legacy_promotions/**/*"
 "changelog:solidus_sample":
 - any:
-  - changed_files:
+  - changed-files:
     - any-glob-to-any-file:
       - "sample/**/*"
 "changelog:solidus":
 - any:
-  - changed_files:
+  - changed-files:
     - any-glob-to-any-file:
       - "lib/**/*"
       - "README.md"
       - "solidus.gemspec"
 "changelog:repository":
 - all:
-  - changed_files:
+  - changed-files:
     - any-glob-to-any-file:
       - "**/*"
     - all-globs-to-all-files:
       - "!core/**/*"
       - "!backend/**/*"
       - "!api/**/*"
       - "!admin/**/*"
+      - "!promotions/**/*"
+      - "!legacy_promotions/**/*"
       - "!sample/**/*"
       - "!lib/**/*"
       - "!README.md"

.github/release.yml

@@ -24,3 +24,6 @@ changelog:
     - title: Solidus Sample
       labels:
         - "changelog:solidus_sample"
+    - title: Solidus Promotions
+      labels:
+        - "changelog:solidus_promotions"

.github/workflows/backport.yml

@@ -10,7 +10,7 @@ jobs:
       github.event.pull_request.merged == true
       && contains(
            join(github.event.pull_request.labels.*.name, '---'),
-           '---backport'
+           'backport'
          )
       && (
         (github.event.action == 'labeled' && startsWith(github.event.label.name, 'backport')) ||

.github/workflows/lint.yml

@@ -0,0 +1,62 @@
+name: Lint
+
+on: [pull_request]
+
+concurrency:
+  group: lint-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'main' }}
+
+permissions:
+  contents: read
+
+env:
+  BUNDLE_ONLY: "lint"
+
+jobs:
+  ruby:
+    name: Check Ruby
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2"
+          bundler-cache: true
+      - name: Lint Ruby files
+        run: bin/rake lint:rb
+      - name: Store test results
+        uses: actions/upload-artifact@v4
+        with:
+          name: rubocop-results
+          path: test-results
+
+  erb:
+    name: Check ERB
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2"
+          bundler-cache: true
+      - name: Lint ERB files
+        run: bin/rake lint:erb
+
+  javascript:
+    name: Check JavaScript
+    runs-on: ubuntu-22.04
+    env:
+      ESLINT_USE_FLAT_CONFIG: false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2"
+          bundler-cache: true
+      - name: Lint JS files
+        run: bin/rake lint:js