diff --git a/.circleci/config.yml b/.circleci/config.yml index 4fe63d1..210320c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 aliases: - &coditsu docker: - - image: circleci/ruby:2.6.5 + - image: cimg/ruby:3.2 steps: - setup_remote_docker - checkout @@ -15,30 +15,24 @@ aliases: -e CODITSU_API_SECRET \ -e CODITSU_REPOSITORY_ID \ --volumes-from sources coditsu/coditsu:latest - - &rails-5 - environment: - BUNDLE_GEMFILE: gemfiles/rails_5.gemfile - &rails-6 environment: BUNDLE_GEMFILE: gemfiles/rails_6.gemfile - &rails-7 environment: BUNDLE_GEMFILE: gemfiles/rails_7.gemfile - - &ruby-2_4_9 - docker: - - image: circleci/ruby:2.4.9 - - &ruby-2_5_7 - docker: - - image: circleci/ruby:2.5.7 - - &ruby-2_6_5 - docker: - - image: circleci/ruby:2.6.5 - &ruby-2_7 docker: - - image: circleci/ruby:2.7 + - image: cimg/ruby:2.7 - &ruby-3_0 docker: - - image: circleci/ruby:3.0 + - image: cimg/ruby:3.0 + - &ruby-3_1 + docker: + - image: cimg/ruby:3.1 + - &ruby-3_2 + docker: + - image: cimg/ruby:3.2 - &job-defaults steps: - checkout @@ -48,32 +42,8 @@ aliases: jobs: coditsu: - <<: *rails-5 + <<: *rails-7 <<: *coditsu - ruby-2_4_9-rails-5: - <<: *ruby-2_4_9 - <<: *rails-5 - <<: *job-defaults - ruby-2_5_7-rails-5: - <<: *ruby-2_5_7 - <<: *rails-5 - <<: *job-defaults - ruby-2_5_7-rails-6: - <<: *ruby-2_5_7 - <<: *rails-6 - <<: *job-defaults - ruby-2_6_5-rails-5: - <<: *ruby-2_6_5 - <<: *rails-5 - <<: *job-defaults - ruby-2_6_5-rails-6: - <<: *ruby-2_6_5 - <<: *rails-6 - <<: *job-defaults - ruby-2_7-rails-5: - <<: *ruby-2_7 - <<: *rails-5 - <<: *job-defaults ruby-2_7-rails-6: <<: *ruby-2_7 <<: *rails-6 @@ -86,16 +56,22 @@ jobs: <<: *ruby-3_0 <<: *rails-7 <<: *job-defaults + ruby-3_1-rails-7: + <<: *ruby-3_1 + <<: *rails-7 + <<: *job-defaults + ruby-3_2-rails-7: + <<: *ruby-3_2 + <<: *rails-7 + <<: *job-defaults workflows: main: jobs: - - coditsu - - ruby-2_4_9-rails-5 - - ruby-2_5_7-rails-5 - - ruby-2_5_7-rails-6 - - ruby-2_6_5-rails-5 - - ruby-2_6_5-rails-6 - - ruby-2_7-rails-5 + - coditsu: + context: + - coditsu - ruby-2_7-rails-6 - ruby-3_0-rails-6 - ruby-3_0-rails-7 + - ruby-3_1-rails-7 + - ruby-3_2-rails-7 diff --git a/Appraisals b/Appraisals index 7d3cf4f..316949e 100644 --- a/Appraisals +++ b/Appraisals @@ -1,11 +1,11 @@ # frozen_string_literal: true -appraise 'rails-5' do - gem 'rails', '~> 5.0' +appraise 'rails-6' do + gem 'rails', '~> 6.0' gem 'rspec-rails' end -appraise 'rails-6' do - gem 'rails', '~> 6.0' +appraise 'rails-7' do + gem 'rails', '~> 7.0' gem 'rspec-rails' end diff --git a/CHANGELOG.md b/CHANGELOG.md index fcfd4ba..1478da9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## master +**BREAKING CHANGES:** + +- [#259](https://github.com/castle/castle-ruby/pull/259) + - Drop support for Rubies < 2.7 and Rails < 6 + - Add Rubies 3.1 and 3.2 to test matrix + - Add Rails 7 to test matrix + ## 7.2.0 - [#253](https://github.com/castle/castle-ruby/pull/253) diff --git a/castle-rb.gemspec b/castle-rb.gemspec index 27df7f5..28bdc6c 100644 --- a/castle-rb.gemspec +++ b/castle-rb.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.test_files = Dir['spec/**/*'] s.require_paths = ['lib'] - s.required_ruby_version = '>= 2.4' + s.required_ruby_version = '>= 2.7' s.add_development_dependency 'appraisal' end diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile deleted file mode 100644 index 1649198..0000000 --- a/gemfiles/rails_5.gemfile +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -# This file was generated by Appraisal - -source 'https://rubygems.org' - -gem 'rack' -gem 'rails', '~> 5.0' -gem 'rake' - -group :development, :test do - gem 'byebug' -end - -group :test do - gem 'coveralls_reborn' - gem 'rspec' - gem 'rspec-rails' - gem 'simplecov' - gem 'timecop' - gem 'webmock' -end - -gemspec path: '../'