Skip to content

Commit

Permalink
Merge pull request #182 from bensheldon/ruby3
Browse files Browse the repository at this point in the history
Add Ruby 3 to CI test matrix
  • Loading branch information
bensheldon authored Dec 28, 2020
2 parents 0557881 + 61cde23 commit e9c1f4e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
timeout-minutes: 15
strategy:
matrix:
ruby: [2.5, 2.6, 2.7]
ruby: [2.5, 2.6, 2.7, 3.0]
pg: [12.5, 10.8]
env:
PGHOST: localhost
Expand Down Expand Up @@ -110,3 +110,9 @@ jobs:
with:
name: screenshots
path: spec/test_app/tmp/screenshots
- name: Archive Rails logs
uses: actions/upload-artifact@v2
if: failure()
with:
name: rails_logs
path: spec/test_app/log
12 changes: 7 additions & 5 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
appraise "rails-5.2" do
gem "rails", "~> 5.2.0"
end
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
appraise "rails-5.2" do
gem "rails", "~> 5.2.0"
end

appraise "rails-6.0" do
gem "rails", "~> 6.0.0"
appraise "rails-6.0" do
gem "rails", "~> 6.0.0"
end
end

appraise "rails-6.1" do
Expand Down
1 change: 0 additions & 1 deletion spec/lib/good_job/cli_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

describe '#start' do
it 'initializes a scheduler' do
allow(GoodJob::Scheduler).to receive(:new).and_call_original
allow(Kernel).to receive(:loop)

cli = described_class.new([], {}, {})
Expand Down

0 comments on commit e9c1f4e

Please sign in to comment.