Skip to content

Commit

Permalink
Merge pull request #108 from Shopify/drop-support-for-ruby-2.5
Browse files Browse the repository at this point in the history
Drop support for ruby 2.5
  • Loading branch information
Gustavo Caso authored Sep 21, 2021
2 parents 5544284 + 72a3086 commit 8801187
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
### Master (unreleased)
- Drop support for ruby 2.5

## v1.1.14 (May 28, 2021)

Expand Down
1 change: 1 addition & 0 deletions job-iteration.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 7 additions & 9 deletions lib/job-iteration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 8801187

Please sign in to comment.