Skip to content

Commit

Permalink
Update Rubies and Rails in test matrix (#259)
Browse files Browse the repository at this point in the history
  • Loading branch information
madejejej authored Jan 9, 2023
1 parent 2d3cd09 commit c39d8b5
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 76 deletions.
70 changes: 23 additions & 47 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion castle-rb.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
24 changes: 0 additions & 24 deletions gemfiles/rails_5.gemfile

This file was deleted.

0 comments on commit c39d8b5

Please sign in to comment.