diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad994e7c..51eea36a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,9 @@ jobs: - 6379:6379 strategy: matrix: - ruby: [2.5, 2.6, 2.7, 3.0] + ruby: [2.6, 2.7, 3.0] gemfile: [rails_5_2, rails_6_0, rails_edge] exclude: - - ruby: 2.5 - gemfile: rails_edge - ruby: 2.6 gemfile: rails_edge - ruby: 3.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index cac1203c..63855f62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### Master (unreleased) +- Drop support for ruby 2.5 ## v1.1.14 (May 28, 2021) diff --git a/job-iteration.gemspec b/job-iteration.gemspec index 1240999b..73a56153 100644 --- a/job-iteration.gemspec +++ b/job-iteration.gemspec @@ -5,6 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "job-iteration/version" Gem::Specification.new do |spec| + spec.required_ruby_version = ">= 2.6" spec.name = "job-iteration" spec.version = JobIteration::VERSION spec.authors = %w(Shopify) diff --git a/lib/job-iteration.rb b/lib/job-iteration.rb index 863fa832..73ea98f1 100644 --- a/lib/job-iteration.rb +++ b/lib/job-iteration.rb @@ -38,16 +38,14 @@ module JobIteration def load_integrations loaded = nil INTEGRATIONS.each do |integration| - begin - load_integration(integration) - if loaded - raise IntegrationLoadError, - "#{loaded} integration has already been loaded, but #{integration} is also available. " \ - "Iteration will only work with one integration." - end - loaded = integration - rescue LoadError + load_integration(integration) + if loaded + raise IntegrationLoadError, + "#{loaded} integration has already been loaded, but #{integration} is also available. " \ + "Iteration will only work with one integration." end + loaded = integration + rescue LoadError end end