From f3cfb2eb96892697a01b8014b65debbb33a5b193 Mon Sep 17 00:00:00 2001 From: Paul Cantrell Date: Sun, 9 Jun 2024 14:26:10 -0500 Subject: [PATCH 1/3] Bumped deps across the board --- Gemfile.lock | 117 +++++++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 56 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2b948fc..5ded9da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,7 +42,7 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.8.1) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) annealer (0.3) arel (9.0.0) @@ -51,12 +51,13 @@ GEM activesupport (>= 4.2, < 5.3) request_store (~> 1.0) scrypt (>= 1.2, < 4.0) - bcrypt (3.1.18) + base64 (0.2.0) + bcrypt (3.1.20) bcrypt-ruby (3.1.5) bcrypt (>= 3.1.3) - builder (3.2.4) - cancancan (3.4.0) - capybara (3.38.0) + builder (3.3.0) + cancancan (3.6.1) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -66,19 +67,19 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) coderay (1.1.3) - concurrent-ruby (1.2.0) + concurrent-ruby (1.3.3) crass (1.0.6) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.1) + database_cleaner (2.0.2) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.1.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.3.3) - diff-lcs (1.5.0) + date (3.3.4) + diff-lcs (1.5.1) docile (1.4.0) erubi (1.12.0) - execjs (2.8.1) + execjs (2.9.1) factory_bot (6.4.5) activesupport (>= 5.0.0) factory_bot_rails (6.4.3) @@ -87,9 +88,9 @@ GEM fancybox2-rails (0.2.7) railties (>= 3.1.0) ffaker (2.21.0) - ffi (1.15.5) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) + ffi (1.17.0) + ffi-compiler (1.3.2) + ffi (>= 1.15.5) rake formtastic (4.0.0) actionpack (>= 5.2.0) @@ -98,56 +99,56 @@ GEM haml (5.2.2) temple (>= 0.8.0) tilt - i18n (1.12.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) - icalendar (2.8.0) + icalendar (2.10.1) ice_cube (~> 0.16) ice_cube (0.16.4) - jbuilder (2.11.5) + jbuilder (2.12.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) - jquery-rails (4.5.1) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) kgio (2.11.4) - loofah (2.19.1) + loofah (2.22.0) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) - method_source (1.0.0) - mini_mime (1.1.2) - mini_portile2 (2.8.1) - minitest (5.17.0) - net-imap (0.3.4) + method_source (1.1.0) + mini_mime (1.1.5) + mini_portile2 (2.8.7) + minitest (5.23.1) + net-imap (0.4.12) date net-protocol net-pop (0.1.2) net-protocol - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.5.0) net-protocol - nio4r (2.5.9) - nokogiri (1.14.3) - mini_portile2 (~> 2.8.0) + nio4r (2.7.3) + nokogiri (1.15.6) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - pg (1.4.5) + pg (1.5.6) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (5.0.1) - puma (6.3.1) + public_suffix (5.0.5) + puma (6.4.2) nio4r (~> 2.0) - racc (1.6.2) - rack (2.2.6.2) - rack-test (2.0.2) + racc (1.8.0) + rack (2.2.9) + rack-test (2.1.0) rack (>= 1.3) rails (5.2.8.1) actioncable (= 5.2.8.1) @@ -166,11 +167,13 @@ GEM actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging @@ -182,14 +185,14 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - raindrops (0.20.0) - rake (13.0.6) + raindrops (0.20.1) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) redcarpet (3.6.0) - regexp_parser (2.7.0) - request_store (1.5.1) + regexp_parser (2.9.2) + request_store (1.7.0) rack (>= 1.4) responders (2.4.1) actionpack (>= 4.2.0, < 6.0) @@ -213,7 +216,7 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.4) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) rubyzip (2.3.2) sass (3.7.4) sass-listen (~> 4.0.0) @@ -226,8 +229,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - scrypt (3.0.7) + scrypt (3.0.8) ffi-compiler (>= 1.0, < 2.0) + rake (>= 9, < 14) selenium-webdriver (4.9.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) @@ -240,8 +244,9 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - spring (4.1.1) - sprockets (3.7.2) + spring (4.2.1) + sprockets (3.7.3) + base64 concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) @@ -249,11 +254,11 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) strscan (3.1.0) - temple (0.10.0) - thor (1.2.1) + temple (0.10.3) + thor (1.3.1) thread_safe (0.3.6) - tilt (2.1.0) - timeout (0.3.2) + tilt (2.3.0) + timeout (0.4.1) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) @@ -265,7 +270,7 @@ GEM kgio (~> 2.6) raindrops (~> 0.7) websocket (1.2.10) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) From ec337e58c7c0920d5db4526f467f9a6459205a24 Mon Sep 17 00:00:00 2001 From: Paul Cantrell Date: Sun, 9 Jun 2024 14:43:09 -0500 Subject: [PATCH 2/3] Updated ruby to 2.7.8 --- .github/workflows/ci.yml | 2 +- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a10ec1..05ad80b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Ruby and run bundle install uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7.7 + ruby-version: 2.7.8 bundler-cache: true - name: Show Ruby version diff --git a/.ruby-version b/.ruby-version index 62ae32d..8122ad0 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.7 \ No newline at end of file +2.7.8 \ No newline at end of file diff --git a/Gemfile b/Gemfile index 824858f..bfd6301 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '2.7.7' +ruby '2.7.8' gem 'rails', '~> 5.2' diff --git a/Gemfile.lock b/Gemfile.lock index 5ded9da..06aeed7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -315,7 +315,7 @@ DEPENDENCIES unicorn RUBY VERSION - ruby 2.7.7p221 + ruby 2.7.8p225 BUNDLED WITH 2.1.4 From fe1ded5a61ef1783b2dde6a4e95857975692255a Mon Sep 17 00:00:00 2001 From: Paul Cantrell Date: Sun, 9 Jun 2024 15:21:01 -0500 Subject: [PATCH 3/3] Pinned ffi gem to 1.16 for Linux compatibility --- Gemfile | 4 ++++ Gemfile.lock | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index bfd6301..3cf0e75 100644 --- a/Gemfile +++ b/Gemfile @@ -41,6 +41,10 @@ gem 'cancancan' gem 'nokogiri' +# FFI 1.17+ isn't compatible with Ruby 2.x on Linux, which breaks GitHub Actions. +# Remove this line when upgrading to Ruby 3. +gem 'ffi', '~> 1.16.3' + group :development, :test do gem 'ffaker' gem 'ruby-progressbar', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 06aeed7..a94501d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -88,7 +88,7 @@ GEM fancybox2-rails (0.2.7) railties (>= 3.1.0) ffaker (2.21.0) - ffi (1.17.0) + ffi (1.16.3) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake @@ -289,6 +289,7 @@ DEPENDENCIES factory_bot_rails fancybox2-rails ffaker + ffi (~> 1.16.3) formtastic haml (~> 5.0) icalendar (~> 2.4)