diff --git a/.circleci/config.yml b/.circleci/config.yml index 8981dd54..e870882f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,8 +13,8 @@ orbs: jobs: run-specs: executor: - name: solidusio_extensions/<> - ruby_version: <> + name: solidusio_extensions/<> + ruby_version: <> steps: - checkout - browser-tools/install-chrome @@ -26,7 +26,7 @@ jobs: sudo apt-get install -yq libvips-dev when: always - run: - name: 'Solidus <>: Install gems' + name: "Solidus <>: Install gems" command: | bundle install environment: @@ -34,7 +34,7 @@ jobs: SOLIDUS_BRANCH: <> when: always - run: - name: 'Solidus <>: Install sandbox with generated starter frontend' + name: "Solidus <>: Install sandbox with generated starter frontend" command: | <<#parameters.coverage>>export COVERAGE=true<> bin/sandbox --seed=false --sample=false @@ -44,13 +44,15 @@ jobs: SOLIDUS_BRANCH: <> when: always - run: - name: 'Runs tests on Solidus <>' + name: "Runs tests on Solidus <>" command: | cd sandbox + bin/rails db:environment:set RAILS_ENV=test bundle add rspec_junit_formatter --group test <<#parameters.coverage>>export COVERAGE=true<> bundle exec rspec --format progress --format RspecJunitFormatter --out ../test-results/results.xml environment: + RAILS_ENV: test RAILS_VERSION: <> SOLIDUS_BRANCH: <> when: always @@ -66,17 +68,16 @@ jobs: destination: coverage - run: command: rm -rf sandbox - name: 'Solidus <>: Clean up' + name: "Solidus <>: Clean up" when: always - solidusio_extensions/store-test-results parameters: solidus_branch: type: string - default: 'main' + default: "main" rails_version: type: string - default: '~> 7.1.0' ruby_version: type: string database: @@ -89,27 +90,44 @@ workflows: "Run specs on development Solidus version": jobs: - run-specs: - name: run-specs-with-postgres-ruby-3-2 - database: 'postgres' - ruby_version: '3.2' + name: run-specs-with-postgres-ruby-3-1-rails-7-2 + database: "postgres" + ruby_version: "3.1" + rails_version: "~> 7.2.0" - run-specs: - name: run-specs-with-postgres-ruby-3-1 - database: 'postgres' - ruby_version: '3.1' + name: run-specs-with-postgres-ruby-3-2-rails-7-2 + database: "postgres" + ruby_version: "3.2" + rails_version: "~> 7.2.0" - run-specs: - name: run-specs-with-postgres-ruby-3-0 - database: 'postgres' - ruby_version: '3.0' + name: run-specs-with-postgres-ruby-3-3-rails-7-2 + database: "postgres" + ruby_version: "3.3" + rails_version: "~> 7.2.0" - run-specs: - name: run-specs-with-mysql-ruby-3-2 - database: 'mysql' - ruby_version: '3.2' + name: run-specs-with-postgres-ruby-3-1-rails-7-1 + database: "postgres" + ruby_version: "3.1" + rails_version: "~> 7.1.0" - run-specs: - name: run-specs-with-sqlite-ruby-3-2 - database: 'sqlite' - ruby_version: '3.2' + name: run-specs-with-postgres-ruby-3-2-rails-7-1 + database: "postgres" + ruby_version: "3.2" + rails_version: "~> 7.1.0" + + - run-specs: + name: run-specs-with-mysql-ruby-3-2-rails-7-2 + database: "mysql" + ruby_version: "3.2" + rails_version: "~> 7.2.0" + + - run-specs: + name: run-specs-with-sqlite-ruby-3-2-rails-7-2 + database: "sqlite" + ruby_version: "3.2" + rails_version: "~> 7.2.0" coverage: true diff --git a/Gemfile b/Gemfile index 7808dfa3..5aa32cbb 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'rails', ENV['RAILS_VERSION'] || '~> 7.1.0' +gem 'rails', ENV['RAILS_VERSION'] || '~> 7.2.0' group :development do gem 'guard'