Merge pull request #242 from solidusio/waiting-for-dev/fix_ci

Update CI configuration

Author: waiting-for-dev

.circleci/config.yml

@@ -11,47 +11,47 @@ orbs:
   solidusio_extensions: solidusio/extensions@volatile
 
 jobs:
-  run-specs-with-postgres:
+  run-specs:
+    parameters:
+      solidus:
+        type: string
+        default: master
+      db:
+        type: string
+        default: "postgres"
+      ruby:
+        type: string
+        default: "3.2"
     executor:
-      name: solidusio_extensions/postgres
-      ruby_version: '3.1'
+      name: solidusio_extensions/<< parameters.db >>
+      ruby_version: << parameters.ruby >>
     steps:
       - checkout
       - browser-tools/install-chrome
-      - solidusio_extensions/run-tests-solidus-master
-      - solidusio_extensions/store-test-results
+      - solidusio_extensions/run-tests-solidus-<< parameters.solidus >>
 
-  run-specs-with-mysql:
-    executor:
-      name: solidusio_extensions/mysql
-      ruby_version: '3.0'
-    steps:
-      - checkout
-      - browser-tools/install-chrome
-      - solidusio_extensions/run-tests-solidus-current
-      - solidusio_extensions/store-test-results
-
-  run-specs-with-sqlite:
+  lint-code:
     executor:
       name: solidusio_extensions/sqlite
-      ruby_version: '2.7'
-    steps:
-      - checkout
-      - browser-tools/install-chrome
-      - solidusio_extensions/run-tests-solidus-older
-      - solidusio_extensions/store-test-results
-
-  lint-code:
-    executor: solidusio_extensions/sqlite
+      ruby_version: "3.0"
     steps:
       - solidusio_extensions/lint-code
 
 workflows:
   "Run specs on supported Solidus versions":
     jobs:
-      - run-specs-with-postgres
-      - run-specs-with-mysql
-      - run-specs-with-sqlite
+      - run-specs:
+          name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
+          matrix:
+            parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
       - lint-code
 
   "Weekly run specs against master":
@@ -63,6 +63,11 @@ workflows:
               only:
                 - master
     jobs:
-      - run-specs-with-postgres
-      - run-specs-with-mysql
-      - run-specs-with-sqlite
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["master"], ruby: ["3.2"], db: ["postgres"] }
+      - run-specs:
+          name: *name
+          matrix:
+            parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }

.rubocop.yml

@@ -5,3 +5,6 @@ require:
 
 AllCops:
   NewCops: disable
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false

spec/support/spree.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/testing_support/factories'
 require 'spree/testing_support/url_helpers'
 require 'spree/testing_support/controller_requests'
 require 'spree/testing_support/authorization_helpers'