From 3c5acaf53106db2d890988021caadd96a7f2a024 Mon Sep 17 00:00:00 2001 From: Peter Goldstein Date: Fri, 7 Jan 2022 12:36:56 -0800 Subject: [PATCH] Add Ruby 3.1 to CI matrix. Lock to Nokogiri < 1.13 for webrat compatibility --- .github/workflows/test.yml | 29 ++++-- Gemfile | 1 + Gemfile.lock | 178 +++++++++++++++++++----------------- gemfiles/Gemfile-rails-5-0 | 1 + gemfiles/Gemfile-rails-5-1 | 1 + gemfiles/Gemfile-rails-5-2 | 1 + gemfiles/Gemfile-rails-6-0 | 1 + gemfiles/Gemfile-rails-6-1 | 7 ++ gemfiles/Gemfile-rails-main | 1 + 9 files changed, 132 insertions(+), 88 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 017b5daf..e212d738 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,8 @@ jobs: - 2.5 - 2.6 - 2.7 - - 3.0 + - '3.0' + - 3.1 env: - DEVISE_ORM=active_record - DEVISE_ORM=mongoid @@ -94,16 +95,32 @@ jobs: gemfile: gemfiles/Gemfile-rails-5-1 - ruby: 2.7 gemfile: gemfiles/Gemfile-rails-5-2 - - ruby: 3.0 + - ruby: '3.0' gemfile: gemfiles/Gemfile-rails-4-1 - - ruby: 3.0 + - ruby: '3.0' gemfile: gemfiles/Gemfile-rails-4-2 - - ruby: 3.0 + - ruby: '3.0' gemfile: gemfiles/Gemfile-rails-5-0 - - ruby: 3.0 + - ruby: '3.0' gemfile: gemfiles/Gemfile-rails-5-1 - - ruby: 3.0 + - ruby: '3.0' gemfile: gemfiles/Gemfile-rails-5-2 + - ruby: 3.1 + gemfile: gemfiles/Gemfile-rails-5-1 + - ruby: 3.1 + gemfile: gemfiles/Gemfile-rails-5-2 + - ruby: 3.1 + gemfile: gemfiles/Gemfile-rails-4-1 + - ruby: 3.1 + gemfile: gemfiles/Gemfile-rails-4-2 + - ruby: 3.1 + gemfile: gemfiles/Gemfile-rails-5-0 + - ruby: 3.1 + gemfile: gemfiles/Gemfile-rails-5-1 + - ruby: 3.1 + gemfile: gemfiles/Gemfile-rails-5-2 + - ruby: 3.1 + gemfile: gemfiles/Gemfile-rails-6-0 - env: DEVISE_ORM=mongoid gemfile: Gemfile - env: DEVISE_ORM=mongoid diff --git a/Gemfile b/Gemfile index 985e37f9..0b41fa0e 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,7 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing" gem "responders", "~> 3.0" group :test do + gem "nokogiri", "< 1.13" gem "omniauth-facebook" gem "omniauth-openid" gem "rexml" diff --git a/Gemfile.lock b/Gemfile.lock index 40c8ec58..21b99836 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/rails/rails-controller-testing.git - revision: 36e84822ee997d69c971f03f3f3759ee4f4bdc37 + revision: 351c0162df0771c0c48e6a5a886c4c2f0a5d1a74 specs: rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -20,61 +20,67 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.0.0) - actionpack (= 7.0.0) - activesupport (= 7.0.0) + actioncable (7.0.2.2) + actionpack (= 7.0.2.2) + activesupport (= 7.0.2.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.0) - actionpack (= 7.0.0) - activejob (= 7.0.0) - activerecord (= 7.0.0) - activestorage (= 7.0.0) - activesupport (= 7.0.0) + actionmailbox (7.0.2.2) + actionpack (= 7.0.2.2) + activejob (= 7.0.2.2) + activerecord (= 7.0.2.2) + activestorage (= 7.0.2.2) + activesupport (= 7.0.2.2) mail (>= 2.7.1) - actionmailer (7.0.0) - actionpack (= 7.0.0) - actionview (= 7.0.0) - activejob (= 7.0.0) - activesupport (= 7.0.0) + net-imap + net-pop + net-smtp + actionmailer (7.0.2.2) + actionpack (= 7.0.2.2) + actionview (= 7.0.2.2) + activejob (= 7.0.2.2) + activesupport (= 7.0.2.2) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.0) - actionview (= 7.0.0) - activesupport (= 7.0.0) + actionpack (7.0.2.2) + actionview (= 7.0.2.2) + activesupport (= 7.0.2.2) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.0) - actionpack (= 7.0.0) - activerecord (= 7.0.0) - activestorage (= 7.0.0) - activesupport (= 7.0.0) + actiontext (7.0.2.2) + actionpack (= 7.0.2.2) + activerecord (= 7.0.2.2) + activestorage (= 7.0.2.2) + activesupport (= 7.0.2.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.0) - activesupport (= 7.0.0) + actionview (7.0.2.2) + activesupport (= 7.0.2.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.0) - activesupport (= 7.0.0) + activejob (7.0.2.2) + activesupport (= 7.0.2.2) globalid (>= 0.3.6) - activemodel (7.0.0) - activesupport (= 7.0.0) - activerecord (7.0.0) - activemodel (= 7.0.0) - activesupport (= 7.0.0) - activestorage (7.0.0) - actionpack (= 7.0.0) - activejob (= 7.0.0) - activerecord (= 7.0.0) - activesupport (= 7.0.0) + activemodel (7.0.2.2) + activesupport (= 7.0.2.2) + activerecord (7.0.2.2) + activemodel (= 7.0.2.2) + activesupport (= 7.0.2.2) + activestorage (7.0.2.2) + actionpack (= 7.0.2.2) + activejob (= 7.0.2.2) + activerecord (= 7.0.2.2) + activesupport (= 7.0.2.2) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.0) + activesupport (7.0.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -83,33 +89,20 @@ GEM builder (3.2.4) concurrent-ruby (1.1.9) crass (1.0.6) + digest (3.1.0) erubi (1.10.0) - faraday (1.8.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday (2.2.0) + faraday-net_http (~> 2.0) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) + faraday-net_http (2.0.1) globalid (1.0.0) activesupport (>= 5.0) hashie (5.0.0) - i18n (1.8.11) + i18n (1.10.0) concurrent-ruby (~> 1.0) + io-wait (0.2.1) jwt (2.3.0) - loofah (2.13.0) + loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -122,13 +115,27 @@ GEM mocha (1.13.0) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.1.1) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.2) + io-wait + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout nio4r (2.5.8) nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) - oauth2 (1.4.7) - faraday (>= 0.8, < 2.0) + oauth2 (1.4.9) + faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) @@ -146,43 +153,46 @@ GEM omniauth (>= 1.0, < 3.0) rack-openid (~> 1.4.0) orm_adapter (0.5.0) + psych (4.0.3) + stringio racc (1.6.0) rack (2.2.3) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-protection (2.1.0) + rack-protection (2.2.0) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (7.0.0) - actioncable (= 7.0.0) - actionmailbox (= 7.0.0) - actionmailer (= 7.0.0) - actionpack (= 7.0.0) - actiontext (= 7.0.0) - actionview (= 7.0.0) - activejob (= 7.0.0) - activemodel (= 7.0.0) - activerecord (= 7.0.0) - activestorage (= 7.0.0) - activesupport (= 7.0.0) + rails (7.0.2.2) + actioncable (= 7.0.2.2) + actionmailbox (= 7.0.2.2) + actionmailer (= 7.0.2.2) + actionpack (= 7.0.2.2) + actiontext (= 7.0.2.2) + actionview (= 7.0.2.2) + activejob (= 7.0.2.2) + activemodel (= 7.0.2.2) + activerecord (= 7.0.2.2) + activestorage (= 7.0.2.2) + activesupport (= 7.0.2.2) bundler (>= 1.15.0) - railties (= 7.0.0) + railties (= 7.0.2.2) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (7.0.0) - actionpack (= 7.0.0) - activesupport (= 7.0.0) + railties (7.0.2.2) + actionpack (= 7.0.2.2) + activesupport (= 7.0.2.2) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rake (13.0.6) - rdoc (6.3.3) + rdoc (6.4.0) + psych (>= 4.0.0) responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) @@ -190,8 +200,11 @@ GEM ruby-openid (2.9.2) ruby2_keywords (0.0.5) sqlite3 (1.4.2) - thor (1.1.0) + stringio (3.0.1) + strscan (3.0.1) + thor (1.2.1) timecop (0.9.4) + timeout (0.2.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) warden (1.2.9) @@ -203,7 +216,7 @@ GEM websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.5.1) + zeitwerk (2.5.4) PLATFORMS ruby @@ -211,6 +224,7 @@ PLATFORMS DEPENDENCIES devise! mocha (~> 1.1) + nokogiri (< 1.13) omniauth omniauth-facebook omniauth-oauth2 @@ -225,4 +239,4 @@ DEPENDENCIES webrat (= 0.7.3) BUNDLED WITH - 2.2.33 + 2.3.4 diff --git a/gemfiles/Gemfile-rails-5-0 b/gemfiles/Gemfile-rails-5-0 index 2f60c3a2..486f0132 100644 --- a/gemfiles/Gemfile-rails-5-0 +++ b/gemfiles/Gemfile-rails-5-0 @@ -14,6 +14,7 @@ gem "rails-controller-testing" gem "responders", "~> 2.1" group :test do + gem "nokogiri", "< 1.13" gem "omniauth-facebook" gem "omniauth-openid" gem "timecop" diff --git a/gemfiles/Gemfile-rails-5-1 b/gemfiles/Gemfile-rails-5-1 index c566e9c8..0d391aa5 100644 --- a/gemfiles/Gemfile-rails-5-1 +++ b/gemfiles/Gemfile-rails-5-1 @@ -12,6 +12,7 @@ gem "rails-controller-testing" gem "responders", "~> 2.1" group :test do + gem "nokogiri", "< 1.13" gem "omniauth-facebook" gem "omniauth-openid" gem "timecop" diff --git a/gemfiles/Gemfile-rails-5-2 b/gemfiles/Gemfile-rails-5-2 index 5dc267de..10bd39ba 100644 --- a/gemfiles/Gemfile-rails-5-2 +++ b/gemfiles/Gemfile-rails-5-2 @@ -12,6 +12,7 @@ gem "rails-controller-testing" gem "responders", "~> 2.1" group :test do + gem "nokogiri", "< 1.13" gem "omniauth-facebook" gem "omniauth-openid" gem "timecop" diff --git a/gemfiles/Gemfile-rails-6-0 b/gemfiles/Gemfile-rails-6-0 index bc9c83d0..d8f77431 100644 --- a/gemfiles/Gemfile-rails-6-0 +++ b/gemfiles/Gemfile-rails-6-0 @@ -12,6 +12,7 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing" gem "responders", "~> 3.0" group :test do + gem "nokogiri", "< 1.13" gem "omniauth-facebook" gem "omniauth-openid" gem "rexml" diff --git a/gemfiles/Gemfile-rails-6-1 b/gemfiles/Gemfile-rails-6-1 index 0a96b0e3..8a8991fe 100644 --- a/gemfiles/Gemfile-rails-6-1 +++ b/gemfiles/Gemfile-rails-6-1 @@ -13,7 +13,14 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing" gem "responders", "~> 3.0" +if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new("3.1") + gem "net-smtp", require: false + gem "net-imap", require: false + gem "net-pop", require: false +end + group :test do + gem "nokogiri", "< 1.13" gem "omniauth-facebook" gem "omniauth-openid" gem "rexml" diff --git a/gemfiles/Gemfile-rails-main b/gemfiles/Gemfile-rails-main index 536c564c..513e0572 100644 --- a/gemfiles/Gemfile-rails-main +++ b/gemfiles/Gemfile-rails-main @@ -14,6 +14,7 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing" gem "responders", "~> 3.0" group :test do + gem "nokogiri", "< 1.13" gem "omniauth-facebook" gem "omniauth-openid" gem "rexml"