Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI builds and update dependencies #884

Merged
merged 2 commits into from
Jun 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby 2.6.7
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '>= 2.2.0'
ruby '>= 2.4.0'

gem 'activerecord', '>= 4.2.5', '< 6', require: false
gem 'rake', require: false
Expand All @@ -20,7 +20,10 @@ group :development, :test do
gem 'rspec', require: false

gem 'rubocop', '~> 0.68.1', require: false unless RUBY_VERSION =~ /^1.8/
gem 'simplecov', require: false
# gem 'rubocop', '~> 1.12', require: false
# gem 'rubocop-rake', require: false
# gem 'rubocop-rspec', require: false
# gem 'simplecov', require: false
gem 'terminal-notifier-guard', require: false

gem 'codeclimate-test-reporter'
Expand Down
2 changes: 1 addition & 1 deletion Guardfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Note: The cmd option is now required due to the increasing number of ways
# NOTE: The cmd option is now required due to the increasing number of ways
# rspec may be run, below are examples of the most common uses.
# * bundler: 'bundle exec rspec'
# * bundler binstubs: 'bin/rspec'
Expand Down
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ def exit_exception(e)
exit e.status_code
end

# Note : this causes annoying psych warnings under Ruby 1.9.2-p180; to fix, upgrade to 1.9.3
# NOTE: this causes annoying psych warnings under Ruby 1.9.2-p180; to fix, upgrade to 1.9.3
begin
require 'bundler'
Bundler.setup(:default, :development)
Expand Down Expand Up @@ -162,7 +162,7 @@ namespace :integration do
fixtures[Digest::MD5.hexdigest(File.read(fname))] = File.expand_path(fname)
end

candidates.keys.each do |digest|
candidates.each_key do |digest|
next unless fixtures.key?(digest)
candidates[digest].each do |fname|
# Double-check contents in case of hash collision...
Expand Down