Skip to content

Commit

Permalink
Merge pull request #377 from samvera/issues-373-jrgriffiniii-ruby-2.7
Browse files Browse the repository at this point in the history
Adding Ruby 2.7.z and Rails 6.y.z releases to the CircleCI build configuration
  • Loading branch information
jeremyf authored Nov 18, 2020
2 parents 7422781 + f6dfe0c commit 613cbf8
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 30 deletions.
36 changes: 18 additions & 18 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,26 @@ workflows:
ci:
jobs:
- test:
name: ruby2-6_rails5-2
ruby_version: 2.6.3
rails_version: 5.2.3
name: ruby2-7_rails6-0
ruby_version: 2.7.1
rails_version: 6.0.3.1
- test:
name: ruby2-5_rails5-2
ruby_version: 2.5.5
rails_version: 5.2.3
name: ruby2-6_rails6-0
ruby_version: 2.6.6
rails_version: 6.0.3.1
- test:
name: ruby2-4_rails5-2
ruby_version: 2.4.6
rails_version: 5.2.3
name: ruby2-5_rails6-0
ruby_version: 2.5.8
rails_version: 6.0.3.1
- test:
name: ruby2-6_rails5-1
ruby_version: 2.6.3
rails_version: 5.1.7
name: ruby2-7_rails5-2
ruby_version: 2.7.1
rails_version: 5.2.4.3
- test:
name: ruby2-5_rails5-1
ruby_version: 2.5.5
rails_version: 5.1.7
name: ruby2-6_rails5-2
ruby_version: 2.6.6
rails_version: 5.2.4.3
- test:
name: ruby2-4_rails5-1
ruby_version: 2.4.6
rails_version: 5.1.7
name: ruby2-5_rails5-2
ruby_version: 2.5.8
rails_version: 5.2.4.3
7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ gemspec
gem 'slop', '~> 3.6' # For byebug

group :development, :test do
gem 'rubocop', '~> 0.47.0', require: false
gem 'rubocop-rspec', '~> 1.13.0', require: false
gem 'pry' unless ENV['CI']
gem 'pry-byebug' unless ENV['CI']
gem 'clamby'
gem 'pry-byebug' unless ENV['CI']
gem 'rubocop', require: false
gem 'rubocop-rspec', require: false
end

if ENV['RAILS_VERSION']
Expand Down
12 changes: 4 additions & 8 deletions hydra-works.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,18 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ['lib']

spec.add_dependency 'activesupport', '>= 4.2.10', '< 6.0'
spec.add_dependency 'hydra-derivatives', '~> 3.0'
spec.add_dependency 'activesupport', '>= 5.2', '< 7.0'
spec.add_dependency 'hydra-derivatives', '~> 3.6'
spec.add_dependency 'hydra-file_characterization', '~> 1.0'
spec.add_dependency 'hydra-pcdm', '>= 0.9'

spec.add_development_dependency 'bundler', '~> 1.7'
spec.add_development_dependency 'bundler', '>= 1.7'
spec.add_development_dependency 'coveralls'
spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'
spec.add_development_dependency 'rake', '~> 12.3'
spec.add_development_dependency 'rspec'
spec.add_development_dependency 'rspec-rails', '~> 3.1'
spec.add_development_dependency 'rspec-rails'
spec.add_development_dependency 'solr_wrapper', '~> 2.0'
spec.add_development_dependency 'sqlite3'
spec.add_development_dependency 'rspec_junit_formatter'

### Pinned dependencies
# Pin sprockets to < 4 since it requires ruby 2.5+
spec.add_dependency 'sprockets', '< 4'
end

0 comments on commit 613cbf8

Please sign in to comment.