Skip to content

Commit

Permalink
Drop old ruby and rails
Browse files Browse the repository at this point in the history
  • Loading branch information
gremerritt committed Sep 20, 2023
1 parent dfa3307 commit b35bcca
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 22 deletions.
10 changes: 4 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ version: 2.1
jobs:
lint:
docker:
- image: $SALSIFY_ECR_REPO/ruby_ci:2.7.7
- image: $SALSIFY_ECR_REPO/ruby_ci:3.0.6
<<: *aws-auth
working_directory: ~/delayed_job_groups
steps:
- checkout
- restore_cache:
keys:
- v1-gems-ruby-2.7.7-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }}
- v1-gems-ruby-2.7.7-
- v1-gems-ruby-3.0.6-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }}
- v1-gems-ruby-3.0.6-
- run:
name: Install Gems
command: |
Expand All @@ -24,7 +24,7 @@ jobs:
bundle clean
fi
- save_cache:
key: v1-gems-ruby-2.7.7-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }}
key: v1-gems-ruby-3.0.6-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }}
paths:
- "vendor/bundle"
- "gemfiles/vendor/bundle"
Expand Down Expand Up @@ -78,11 +78,9 @@ workflows:
matrix:
parameters:
gemfile:
- "gemfiles/rails_6.0.gemfile"
- "gemfiles/rails_6.1.gemfile"
- "gemfiles/rails_7.0.gemfile"
ruby_version:
- "2.7.7"
- "3.0.6"
- "3.1.4"
- "3.2.2"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ test/tmp
test/version_tmp
tmp
*.gemfile.lock
.ruby-version
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ inherit_gem:
salsify_rubocop: conf/rubocop.yml

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0
Exclude:
- 'vendor/**/*'
- 'gemfiles/**/*'
Expand Down
5 changes: 0 additions & 5 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# frozen_string_literal: true

appraise 'rails-6.0' do
gem 'activerecord', '~> 6.0.4'
gem 'activesupport', '~> 6.0.4'
end

appraise 'rails-6.1' do
gem 'activerecord', '~> 6.1.5'
gem 'activesupport', '~> 6.1.5'
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

### 0.9.0
- Add a `CompleteStuckJobGroupsJob`, which can be run periodically to close "stuck" job groups
- Drop support for Ruby 2.7
- Drop support for Rails 6.0

### 0.8.0
- Drop support for ruby < 2.7
Expand Down
4 changes: 2 additions & 2 deletions delayed_job_groups.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
spec.test_files = Dir.glob('spec/**/*')
spec.require_paths = ['lib']

spec.required_ruby_version = '>= 2.7'
spec.required_ruby_version = '>= 3.0'

spec.add_dependency 'delayed_job', '>= 4.1'
spec.add_dependency 'delayed_job_active_record', '>= 4.1'
Expand All @@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
'for upgrade/installation notes.'

spec.add_development_dependency 'appraisal'
spec.add_dependency 'activerecord', '>= 5.2', '< 7.1'
spec.add_dependency 'activerecord', '>= 6.1', '< 7.1'
spec.add_development_dependency 'coveralls_reborn', '>= 0.18.0'
spec.add_development_dependency 'database_cleaner', '>= 1.2'
spec.add_development_dependency 'factory_bot_rails'
Expand Down
8 changes: 0 additions & 8 deletions gemfiles/rails_6.0.gemfile

This file was deleted.

0 comments on commit b35bcca

Please sign in to comment.