Skip to content

Commit 6d777e9

Browse files
authored
Fix failing build and upgrade dev dependencies (#278)
1 parent c8bfc48 commit 6d777e9

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/tests.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ jobs:
2929
uses: actions/checkout@master
3030

3131
- name: Setup ruby ${{ matrix.ruby }}
32-
uses: eregon/use-ruby-action@master
32+
uses: ruby/setup-ruby@v1
3333
with:
3434
ruby-version: ${{ matrix.ruby }}
35+
bundler: 1
3536

3637
- name: Restore cache
3738
uses: actions/cache@v1
@@ -44,9 +45,6 @@ jobs:
4445
- name: Prepare environment
4546
run: |
4647
sudo apt-get -y install libsqlite3-dev libxslt1-dev
47-
gem uninstall bundler -v '>= 2' -ax --force || true
48-
gem install bundler -v '~>1.0' -N || true
49-
echo "::set-env name=BUNDLER_VERSION::$(bundle -v | grep -o -P '\d+\.\d+.\d+')"
5048
5149
- name: Install
5250
run: |

Appraisals

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Bundler >= 2.x do not work with Rails 4.2
2-
if (ENV['BUNDLER_VERSION'] || `bundler -v`[/\d+\.\d+\.\d+/]).start_with?('1.17')
2+
if (`bundler -v`[/\d+\.\d+\.\d+/]).start_with?('1.17')
33
appraise 'rails-4.2' do
44
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.25', platform: :jruby
5-
gem 'rails', '4.2.11.1'
5+
gem 'rails', '4.2.11.3'
66
gem 'rspec-rails', '~> 3.7'
77
gem 'sprockets', '~> 3.7'
88
gem 'sqlite3', '< 1.4.0', platform: :ruby
@@ -29,7 +29,7 @@ end
2929
appraise 'rails-5.2' do
3030
gem 'activerecord-jdbcsqlite3-adapter', '~> 52.5', platform: :jruby
3131
gem 'bootsnap', '~> 1.4'
32-
gem 'rails', '5.2.4.1'
32+
gem 'rails', '5.2.4.3'
3333
gem 'rspec-rails', '~> 3.7'
3434
gem 'sqlite3', '< 1.4.0', platform: :ruby
3535
end
@@ -39,10 +39,12 @@ if RUBY_VERSION >= '2.5.0'
3939
appraise 'rails-6.0' do
4040
gem 'activerecord-jdbcsqlite3-adapter', '~> 60.1', platform: :jruby
4141
gem 'bootsnap', '~> 1.4'
42-
gem 'rails', '6.0.2.1'
42+
gem 'rails', '6.0.3.1'
4343
gem 'rspec-rails', '~> 3.7'
4444
gem 'sqlite3', '~> 1.4.0', platform: :ruby
4545
end
46+
else
47+
puts 'Skipping rails-6.0 for Ruby < 2.5'
4648
end
4749

4850
appraise 'sinatra' do

config.gemspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ Please consider donating to our open collective to help us maintain this project
3232
s.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'
3333

3434
# Testing
35-
s.add_development_dependency 'appraisal', '~> 2.2', '>= 2.2.0'
36-
s.add_development_dependency 'rspec', '~> 3.7', '>= 3.7.0'
35+
s.add_development_dependency 'appraisal', '~> 2.3', '>= 2.3.0'
36+
s.add_development_dependency 'rspec', '~> 3.9', '>= 3.9.0'
3737

3838
# Default RSpec run will test against latest Rails app
3939
unless ENV['APPRAISAL_INITIALIZED'] || ENV['GITHUB_ACTIONS']
@@ -45,10 +45,10 @@ Please consider donating to our open collective to help us maintain this project
4545

4646
if ENV['GITHUB_ACTIONS']
4747
# Code coverage is needed only in CI
48-
s.add_development_dependency 'simplecov', '~> 0.17.1' if RUBY_ENGINE == 'ruby'
48+
s.add_development_dependency 'simplecov', '~> 0.18.5' if RUBY_ENGINE == 'ruby'
4949
else
5050
# Static code analysis to be used locally
51-
s.add_development_dependency 'mdl', '~> 0.8', '>= 0.8.0'
52-
s.add_development_dependency 'rubocop', '~> 0.78.0'
51+
s.add_development_dependency 'mdl', '~> 0.9', '>= 0.9.0'
52+
s.add_development_dependency 'rubocop', '~> 0.85.0'
5353
end
5454
end

0 commit comments

Comments
 (0)