From 34b658cb1bf22032db20426ee876fb892262df39 Mon Sep 17 00:00:00 2001 From: Chris Colvard Date: Tue, 25 Oct 2022 11:57:13 -0400 Subject: [PATCH 1/3] Test with newer ruby/rails --- .circleci/config.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 86e2e98..60d4379 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,6 +54,32 @@ jobs: workflows: ci: jobs: + - bundle_and_test: + name: ruby3-1_rails7-0 + ruby_version: 3.1.2 + rails_version: 7.0.4 + - bundle_and_test: + name: ruby3-1_rails6-1 + ruby_version: 3.1.2 + rails_version: 6.1.7 + - bundle_and_test: + name: ruby3-1_rails6-0 + ruby_version: 3.1.2 + rails_version: 6.0.6 + + - bundle_and_test: + name: ruby3-0_rails7-0 + ruby_version: 3.0.4 + rails_version: 7.0.4 + - bundle_and_test: + name: ruby3-0_rails6-1 + ruby_version: 3.0.4 + rails_version: 6.1.7 + - bundle_and_test: + name: ruby3-0_rails6-0 + ruby_version: 3.0.4 + rails_version: 6.0.6 + - bundle_and_test: name: ruby2-7_rails6-1 ruby_version: 2.7.5 From 05ca2657b84a52114e1dc846c154bec0964d477c Mon Sep 17 00:00:00 2001 From: Chris Colvard Date: Tue, 25 Oct 2022 12:06:27 -0400 Subject: [PATCH 2/3] Allow rails 7 and use newer bixby --- noid-rails.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/noid-rails.gemspec b/noid-rails.gemspec index 33cd926..f15ca32 100644 --- a/noid-rails.gemspec +++ b/noid-rails.gemspec @@ -18,10 +18,10 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^spec/}) spec.require_paths = ['lib'] - spec.add_dependency 'actionpack', '>= 5.0.0', '< 7' + spec.add_dependency 'actionpack', '>= 5.0.0', '< 7.1' spec.add_dependency 'noid', '~> 0.9' - spec.add_development_dependency 'bixby', '~> 3.0.0' + spec.add_development_dependency 'bixby', '~> 5.0.0' spec.add_development_dependency 'bundler', '>= 1.7' spec.add_development_dependency 'engine_cart', '~> 2.2' spec.add_development_dependency 'rake', '>= 11' From f6ccd884be506acb69dd7be65991a95133bd45dd Mon Sep 17 00:00:00 2001 From: Chris Colvard Date: Tue, 25 Oct 2022 12:57:39 -0400 Subject: [PATCH 3/3] Drop failing configurations Drop testing of these configurations: Ruby 3.1 and Rails 6.0 and 6.1 Ruby 2.5 and Rails 5.1 and 5.2 --- .circleci/config.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 60d4379..922aae6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,14 +58,6 @@ workflows: name: ruby3-1_rails7-0 ruby_version: 3.1.2 rails_version: 7.0.4 - - bundle_and_test: - name: ruby3-1_rails6-1 - ruby_version: 3.1.2 - rails_version: 6.1.7 - - bundle_and_test: - name: ruby3-1_rails6-0 - ruby_version: 3.1.2 - rails_version: 6.0.6 - bundle_and_test: name: ruby3-0_rails7-0 @@ -114,12 +106,3 @@ workflows: name: ruby2-5_rails6-0 ruby_version: 2.5.9 rails_version: 6.0.3.1 - - bundle_and_test: - name: ruby2-5_rails5-2 - ruby_version: 2.5.9 - rails_version: 5.2.4.3 - - bundle_and_test: - name: ruby2-5_rails5-1 - ruby_version: 2.5.9 - rails_version: 5.1.7 -