From 98704717844e064e8bdb05257a1de2c77a79347e Mon Sep 17 00:00:00 2001 From: Chris Colvard Date: Mon, 23 Jan 2023 13:08:59 -0500 Subject: [PATCH 1/3] Test with ruby 3.2 and newest patch version of rails --- .circleci/config.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eacb33a..b8d1109 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -108,44 +108,56 @@ workflows: jobs: # Rails 7.0 + - bundle_and_test: + name: ruby3-2_rails7-0 + ruby_version: 3.2.0 + rails_version: 7.0.4.1 - bundle_and_test: name: ruby3-1_rails7-0 ruby_version: 3.1.3 - rails_version: 7.0.4 + rails_version: 7.0.4.1 - bundle_and_test: name: ruby3-0_rails7-0 ruby_version: 3.0.5 - rails_version: 7.0.4 + rails_version: 7.0.4.1 - bundle_and_test: name: ruby2-7_rails7-0 ruby_version: 2.7.7 - rails_version: 7.0.4 + rails_version: 7.0.4.1 # Rails 6.1 + - bundle_and_test: + name: ruby3-2_rails6-1 + ruby_version: 3.2.0 + rails_version: 6.1.7.1 - bundle_and_test: name: ruby3-1_rails6-1 ruby_version: 3.1.3 - rails_version: 6.1.7 + rails_version: 6.1.7.1 - bundle_and_test: name: ruby3-0_rails6-1 ruby_version: 3.0.5 - rails_version: 6.1.7 + rails_version: 6.1.7.1 - bundle_and_test: name: ruby2-7_rails6-1 ruby_version: 2.7.7 - rails_version: 6.1.7 + rails_version: 6.1.7.1 # Rails 6.0 + - bundle_and_test: + name: ruby3-2_rails6-0 + ruby_version: 3.2.0 + rails_version: 6.0.6.1 - bundle_and_test: name: ruby3-1_rails6-0 ruby_version: 3.1.3 - rails_version: 6.0.6 + rails_version: 6.0.6.1 - bundle_and_test: name: ruby3-0_rails6-0 ruby_version: 3.0.5 - rails_version: 6.0.6 + rails_version: 6.0.6.1 - bundle_and_test: name: ruby2-7_rails6-0 ruby_version: 2.7.7 - rails_version: 6.0.6 + rails_version: 6.0.6.1 # Rails 5.2 - bundle_and_test: name: ruby3-0_rails5-2 From b13b9b56769ed25f906b7378a90fa19d6f311bc8 Mon Sep 17 00:00:00 2001 From: Chris Colvard Date: Mon, 23 Jan 2023 13:13:17 -0500 Subject: [PATCH 2/3] Apply config changes to on-demand jobs not just nightly jobs --- .circleci/config.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b8d1109..4316dbf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,44 +49,56 @@ workflows: ci: jobs: # Rails 7.0 + - bundle_and_test: + name: ruby3-2_rails7-0 + ruby_version: 3.2.0 + rails_version: 7.0.4.1 - bundle_and_test: name: ruby3-1_rails7-0 ruby_version: 3.1.3 - rails_version: 7.0.4 + rails_version: 7.0.4.1 - bundle_and_test: name: ruby3-0_rails7-0 ruby_version: 3.0.5 - rails_version: 7.0.4 + rails_version: 7.0.4.1 - bundle_and_test: name: ruby2-7_rails7-0 ruby_version: 2.7.7 - rails_version: 7.0.4 + rails_version: 7.0.4.1 # Rails 6.1 + - bundle_and_test: + name: ruby3-2_rails6-1 + ruby_version: 3.2.0 + rails_version: 6.1.7.1 - bundle_and_test: name: ruby3-1_rails6-1 ruby_version: 3.1.3 - rails_version: 6.1.7 + rails_version: 6.1.7.1 - bundle_and_test: name: ruby3-0_rails6-1 ruby_version: 3.0.5 - rails_version: 6.1.7 + rails_version: 6.1.7.1 - bundle_and_test: name: ruby2-7_rails6-1 ruby_version: 2.7.7 - rails_version: 6.1.7 + rails_version: 6.1.7.1 # Rails 6.0 + - bundle_and_test: + name: ruby3-2_rails6-0 + ruby_version: 3.2.0 + rails_version: 6.0.6.1 - bundle_and_test: name: ruby3-1_rails6-0 ruby_version: 3.1.3 - rails_version: 6.0.6 + rails_version: 6.0.6.1 - bundle_and_test: name: ruby3-0_rails6-0 ruby_version: 3.0.5 - rails_version: 6.0.6 + rails_version: 6.0.6.1 - bundle_and_test: name: ruby2-7_rails6-0 ruby_version: 2.7.7 - rails_version: 6.0.6 + rails_version: 6.0.6.1 # Rails 5.2 - bundle_and_test: name: ruby3-0_rails5-2 From 667c39a2c13f25a6c35ad97a8282276e2b06f573 Mon Sep 17 00:00:00 2001 From: Chris Colvard Date: Mon, 23 Jan 2023 13:37:53 -0500 Subject: [PATCH 3/3] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4316dbf..f9a2f7e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: type: string bundler_version: type: string - default: 2.0.1 + default: 2.4.5 ruby_type: type: string default: ruby