Skip to content

Commit

Permalink
add support for ruby 3.0.x - fixes keypup-io#27
Browse files Browse the repository at this point in the history
  • Loading branch information
Arnaud Lachaume committed May 31, 2021
1 parent 092885e commit 34a9647
Show file tree
Hide file tree
Showing 28 changed files with 296 additions and 185 deletions.
48 changes: 48 additions & 0 deletions .github/workflows/test_ruby_2.x.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Ruby 2.x

on:
push:
branches: [ master, 0.9-stable ]
pull_request:
branches: [ master, 0.9-stable ]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
ruby:
- '2.5.x'
- '2.6.x'
- '2.7.x'
appraisal:
- 'google-cloud-tasks-1.0'
- 'google-cloud-tasks-1.1'
- 'google-cloud-tasks-1.2'
- 'google-cloud-tasks-1.3'
- 'rails-5.2'
- 'rails-6.0'
- 'rails-6.1'
- 'semantic_logger-3.4'
- 'semantic_logger-4.6'
- 'semantic_logger-4.7.0'
- 'semantic_logger-4.7.2'
steps:
- name: Setup System
run: sudo apt-get install libsqlite3-dev
- uses: actions/checkout@v2
- uses: zhulik/[email protected]
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Build and test with Rake
env:
APPRAISAL_CONTEXT: ${{ matrix.appraisal }}
run: |
gem install bundler
bundle install --jobs 4 --retry 3
bundle exec rubocop
bundle exec appraisal ${APPRAISAL_CONTEXT} bundle
bundle exec appraisal ${APPRAISAL_CONTEXT} rspec
11 changes: 5 additions & 6 deletions .github/workflows/test.yml → .github/workflows/test_ruby_3.x.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Test
name: Ruby 3.x

on:
push:
Expand All @@ -12,15 +12,13 @@ jobs:
strategy:
matrix:
ruby:
- '2.5.x'
- '2.6.x'
- '3.0.x'
appraisal:
- 'google-cloud-tasks-1.0'
- 'google-cloud-tasks-1.1'
- 'google-cloud-tasks-1.2'
- 'google-cloud-tasks-1.3'
- 'rails-5.2'
- 'rails-6.0'
- 'rails-6.1'
- 'semantic_logger-3.4'
- 'semantic_logger-4.6'
- 'semantic_logger-4.7.0'
Expand All @@ -31,9 +29,10 @@ jobs:
- uses: actions/checkout@v2
- uses: zhulik/[email protected]
- name: Set up Ruby 2.6
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Build and test with Rake
env:
APPRAISAL_CONTEXT: ${{ matrix.appraisal }}
Expand Down
4 changes: 4 additions & 0 deletions Appraisals
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ appraise 'rails-6.0' do
gem 'rails', '6.0'
end

appraise 'rails-6.1' do
gem 'rails', '6.1'
end

appraise 'semantic_logger-3.4' do
gem 'semantic_logger', '3.4.1'
end
Expand Down
2 changes: 1 addition & 1 deletion examples/rails/.ruby-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.5.5
ruby-3.0.0
6 changes: 4 additions & 2 deletions examples/rails/Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.5'
ruby '3.0.0'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.2'
gem 'rails', '~> 6.1.3'

gem 'puma', '~> 5.3.2'

# Background jobs via Cloud Tasks
gem 'cloudtasker', path: '../../'
Expand Down
134 changes: 71 additions & 63 deletions examples/rails/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,67 +13,72 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.3.7)
actionpack (= 6.0.3.7)
actioncable (6.1.3.2)
actionpack (= 6.1.3.2)
activesupport (= 6.1.3.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.7)
actionpack (= 6.0.3.7)
activejob (= 6.0.3.7)
activerecord (= 6.0.3.7)
activestorage (= 6.0.3.7)
activesupport (= 6.0.3.7)
actionmailbox (6.1.3.2)
actionpack (= 6.1.3.2)
activejob (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
mail (>= 2.7.1)
actionmailer (6.0.3.7)
actionpack (= 6.0.3.7)
actionview (= 6.0.3.7)
activejob (= 6.0.3.7)
actionmailer (6.1.3.2)
actionpack (= 6.1.3.2)
actionview (= 6.1.3.2)
activejob (= 6.1.3.2)
activesupport (= 6.1.3.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.3.7)
actionview (= 6.0.3.7)
activesupport (= 6.0.3.7)
rack (~> 2.0, >= 2.0.8)
actionpack (6.1.3.2)
actionview (= 6.1.3.2)
activesupport (= 6.1.3.2)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.3.7)
actionpack (= 6.0.3.7)
activerecord (= 6.0.3.7)
activestorage (= 6.0.3.7)
activesupport (= 6.0.3.7)
actiontext (6.1.3.2)
actionpack (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
nokogiri (>= 1.8.5)
actionview (6.0.3.7)
activesupport (= 6.0.3.7)
actionview (6.1.3.2)
activesupport (= 6.1.3.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.7)
activesupport (= 6.0.3.7)
activejob (6.1.3.2)
activesupport (= 6.1.3.2)
globalid (>= 0.3.6)
activemodel (6.0.3.7)
activesupport (= 6.0.3.7)
activerecord (6.0.3.7)
activemodel (= 6.0.3.7)
activesupport (= 6.0.3.7)
activestorage (6.0.3.7)
actionpack (= 6.0.3.7)
activejob (= 6.0.3.7)
activerecord (= 6.0.3.7)
activemodel (6.1.3.2)
activesupport (= 6.1.3.2)
activerecord (6.1.3.2)
activemodel (= 6.1.3.2)
activesupport (= 6.1.3.2)
activestorage (6.1.3.2)
actionpack (= 6.1.3.2)
activejob (= 6.1.3.2)
activerecord (= 6.1.3.2)
activesupport (= 6.1.3.2)
marcel (~> 1.0.0)
activesupport (6.0.3.7)
mini_mime (~> 1.0.2)
activesupport (6.1.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
builder (3.2.4)
concurrent-ruby (1.1.8)
connection_pool (2.2.5)
crass (1.0.6)
date (3.1.0)
erubi (1.10.0)
et-orbi (1.2.4)
tzinfo
Expand Down Expand Up @@ -139,7 +144,7 @@ GEM
marcel (1.0.1)
memoist (0.16.2)
method_source (1.0.0)
mini_mime (1.1.0)
mini_mime (1.0.3)
mini_portile2 (2.5.2)
net-ftp (~> 0.1)
minitest (5.14.4)
Expand All @@ -157,37 +162,39 @@ GEM
racc (~> 1.4)
os (1.1.1)
public_suffix (4.0.6)
puma (5.3.2)
nio4r (~> 2.0)
raabro (1.4.0)
racc (1.5.2)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.3.7)
actioncable (= 6.0.3.7)
actionmailbox (= 6.0.3.7)
actionmailer (= 6.0.3.7)
actionpack (= 6.0.3.7)
actiontext (= 6.0.3.7)
actionview (= 6.0.3.7)
activejob (= 6.0.3.7)
activemodel (= 6.0.3.7)
activerecord (= 6.0.3.7)
activestorage (= 6.0.3.7)
activesupport (= 6.0.3.7)
bundler (>= 1.3.0)
railties (= 6.0.3.7)
rails (6.1.3.2)
actioncable (= 6.1.3.2)
actionmailbox (= 6.1.3.2)
actionmailer (= 6.1.3.2)
actionpack (= 6.1.3.2)
actiontext (= 6.1.3.2)
actionview (= 6.1.3.2)
activejob (= 6.1.3.2)
activemodel (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
bundler (>= 1.15.0)
railties (= 6.1.3.2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.0.3.7)
actionpack (= 6.0.3.7)
activesupport (= 6.0.3.7)
railties (6.1.3.2)
actionpack (= 6.1.3.2)
activesupport (= 6.1.3.2)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
thor (~> 1.0)
rake (13.0.3)
redis (4.2.5)
retriable (3.1.2)
Expand All @@ -207,11 +214,11 @@ GEM
sprockets (>= 3.0.0)
sqlite3 (1.4.2)
thor (1.1.0)
thread_safe (0.3.6)
time (0.1.0)
date
timeout (0.1.1)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
websocket-driver (0.7.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand All @@ -222,11 +229,12 @@ PLATFORMS

DEPENDENCIES
cloudtasker!
rails (~> 6.0.2)
puma (~> 5.3.2)
rails (~> 6.1.3)
sqlite3

RUBY VERSION
ruby 2.5.5p157
ruby 3.0.0p0

BUNDLED WITH
2.2.9
2 changes: 1 addition & 1 deletion examples/sinatra/Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.5'
ruby '3.0.0'

# Web framework
gem 'sinatra'
Expand Down
Loading

0 comments on commit 34a9647

Please sign in to comment.