Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Test against Rails 7 by default
Damian Legawiec3452edd10ad9
diff --git a/.circleci/config.yml b/.circleci/config.ymlindex b7a8a802ef..183f1e93c9 100644--- a/.circleci/config.yml+++ b/.circleci/config.yml@@ -27,6 +27,11 @@ run_tests: &run_testskeys:- spree-bundle-v10-ruby-2-7-{{ .Branch }}- spree-bundle-v10-ruby-2-7+ - run:+ name: Ensure Bundle Install+ command: |+ bundle install+ ./bin/build-ci.rb install- run:name: Run rspec in parallelcommand: ./bin/build-ci.rb test@@ -48,6 +53,11 @@ run_tests_3_0: &run_tests_3_0keys:- spree-bundle-v10-ruby-3-0-{{ .Branch }}- spree-bundle-v10-ruby-3-0+ - run:+ name: Ensure Bundle Install+ command: |+ bundle install+ ./bin/build-ci.rb install- run:name: Run rspec in parallelcommand: ./bin/build-ci.rb test@@ -151,56 +161,12 @@ jobs:environment:<<: *postgres_environmentRAILS_VERSION: '~> 6.0.0'- steps:- - checkout- - restore_cache:- keys:- - spree-bundle-v10-ruby-2-7-{{ .Branch }}- - spree-bundle-v10-ruby-2-7- - run:- name: Ensure Bundle Install- command: |- bundle install- ./bin/build-ci.rb install- - run:- name: Run rspec in parallel- command: ./bin/build-ci.rb test- - store_artifacts:- path: /tmp/test-artifacts- destination: test-artifacts- - store_artifacts:- path: /tmp/test-results- destination: raw-test-output- - store_test_results:- path: /tmp/test-results- tests_postgres_rails_5_2:+ tests_postgres_rails_6_1:<<: *tests_postgresenvironment:<<: *postgres_environment- RAILS_VERSION: '~> 5.2.0'- steps:- - checkout- - restore_cache:- keys:- - spree-bundle-v10-ruby-2-7-{{ .Branch }}- - spree-bundle-v10-ruby-2-7- - run:- name: Ensure Bundle Install- command: |- bundle install- ./bin/build-ci.rb install- - run:- name: Run rspec in parallel- command: ./bin/build-ci.rb test- - store_artifacts:- path: /tmp/test-artifacts- destination: test-artifacts- - store_artifacts:- path: /tmp/test-results- destination: raw-test-output- - store_test_results:- path: /tmp/test-results+ RAILS_VERSION: '~> 6.1.0'tests_mysql: &tests_mysql<<: *run_tests@@ -300,7 +266,7 @@ workflows:- tests_postgres_rails_6_0:requires:- bundle- - tests_postgres_rails_5_2:+ - tests_postgres_rails_6_1:requires:- bundle- tests_mysql_ruby_3_0:diff --git a/common_spree_dependencies.rb b/common_spree_dependencies.rbindex b150a882a4..aebb808b9c 100644--- a/common_spree_dependencies.rb+++ b/common_spree_dependencies.rb@@ -9,7 +9,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]actionmailer actionpack actionview activejob activemodel activerecordactivestorage activesupport railties].each do |rails_gem|- gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 6.1.0'), require: false+ gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 7.0.0.alpha2'), require: falseendplatforms :jruby do@@ -24,8 +24,8 @@ platforms :ruby doendend-if ENV['RAILS_VERSION']&.match(/7\.0\.0/)- gem 'paranoia', github: 'damianlegawiec/paranoia', branch: 'core'+if ENV['RAILS_VERSION']&.match(/7\.0\.0/) || !ENV['RAILS_VERSION']+ gem 'paranoia', github: 'payrollhero/paranoia', branch: 'rails7'gem 'awesome_nested_set', github: 'damianlegawiec/awesome_nested_set', branch: 'master'gem 'ransack', github: 'activerecord-hackery/ransack', branch: 'master'end