From 2659e9d5b4dc77c7da739c682a873f90f739a6fe Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Wed, 25 Sep 2024 14:25:30 +0800 Subject: [PATCH] Update and test for Rails 7.2 (#247) --- .github/workflows/build.yml | 8 +- Gemfile | 4 +- Gemfile.lock | 136 ++++++++++++++++---------------- gemfiles/Gemfile-7-1 | 4 +- gemfiles/Gemfile-7-2 | 7 ++ test/dummy/tmp/local_secret.txt | 1 + 6 files changed, 85 insertions(+), 75 deletions(-) create mode 100644 gemfiles/Gemfile-7-2 create mode 100644 test/dummy/tmp/local_secret.txt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 97fc892..7e33adc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,9 +3,9 @@ on: pull_request: push: branches: - - '*' + - "*" tags: - - '*' + - "*" jobs: build: if: "!contains(github.event.head_commit.message, '[skip ci]')" @@ -14,8 +14,10 @@ jobs: fail-fast: false matrix: include: - - ruby: 3.2 + - ruby: 3.3 gemfile: Gemfile + - ruby: 3.3 + gemfile: gemfiles/Gemfile-7-2 - ruby: 3.2 gemfile: gemfiles/Gemfile-7-1 - ruby: 3.2 diff --git a/Gemfile b/Gemfile index a3eb1a8..ecbc5cd 100644 --- a/Gemfile +++ b/Gemfile @@ -3,5 +3,5 @@ source "https://rubygems.org" gemspec -gem "railties", "~> 7.1.0.rc2" -gem "activerecord", "~> 7.1.0.rc2" +gem "railties", "~> 7.2.0" +gem "activerecord", "~> 7.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 230c996..ecbfbf3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,75 +8,77 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (7.1.0.rc2) - actionview (= 7.1.0.rc2) - activesupport (= 7.1.0.rc2) + actionpack (7.2.1) + actionview (= 7.2.1) + activesupport (= 7.2.1) nokogiri (>= 1.8.5) - rack (>= 2.2.4) + racc + rack (>= 2.2.4, < 3.2) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.0.rc2) - activesupport (= 7.1.0.rc2) + useragent (~> 0.16) + actionview (7.2.1) + activesupport (= 7.2.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activemodel (7.1.0.rc2) - activesupport (= 7.1.0.rc2) - activerecord (7.1.0.rc2) - activemodel (= 7.1.0.rc2) - activesupport (= 7.1.0.rc2) + activemodel (7.2.1) + activesupport (= 7.2.1) + activerecord (7.2.1) + activemodel (= 7.2.1) + activesupport (= 7.2.1) timeout (>= 0.4.0) - activesupport (7.1.0.rc2) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) ast (2.4.2) - base64 (0.1.1) - bigdecimal (3.1.4) - builder (3.2.4) - concurrent-ruby (1.2.2) + base64 (0.2.0) + bigdecimal (3.1.8) + builder (3.3.0) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crass (1.0.6) - drb (2.1.1) - ruby2_keywords - erubi (1.12.0) - i18n (1.14.1) + drb (2.2.1) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) - io-console (0.6.0) - irb (1.8.1) - rdoc - reline (>= 0.3.8) - json (2.6.3) + io-console (0.7.2) + irb (1.14.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + json (2.7.2) language_server-protocol (3.17.0.3) - loofah (2.21.3) + logger (1.6.1) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mini_portile2 (2.8.4) - minitest (5.20.0) - mutex_m (0.1.2) - nokogiri (1.15.4) + mini_portile2 (2.8.7) + minitest (5.25.1) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.4-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - parallel (1.23.0) - parser (3.2.2.3) + parallel (1.26.3) + parser (3.3.5.0) ast (~> 2.4.1) racc - pg (1.5.4) - psych (5.1.0) + pg (1.5.8) + psych (5.1.2) stringio - racc (1.7.1) - rack (3.0.8) + racc (1.8.1) + rack (3.1.7) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -91,60 +93,58 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.0.rc2) - actionpack (= 7.1.0.rc2) - activesupport (= 7.1.0.rc2) - irb + railties (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.0.6) - rdoc (6.5.0) + rake (13.2.1) + rdoc (6.7.0) psych (>= 4.0.0) - regexp_parser (2.8.1) - reline (0.3.8) + regexp_parser (2.9.2) + reline (0.5.10) io-console (~> 0.5) - rexml (3.2.6) - rubocop (1.56.4) - base64 (~> 0.1.1) + rubocop (1.66.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - sqlite3 (1.6.6) + securerandom (0.3.1) + sqlite3 (2.1.0) mini_portile2 (~> 2.8.0) - sqlite3 (1.6.6-x86_64-darwin) - stringio (3.0.8) - thor (1.2.2) - timeout (0.4.0) + sqlite3 (2.1.0-x86_64-darwin) + stringio (3.1.1) + thor (1.3.2) + timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - webrick (1.8.1) - zeitwerk (2.6.12) + unicode-display_width (2.6.0) + useragent (0.16.10) + webrick (1.8.2) + zeitwerk (2.6.18) PLATFORMS ruby x86_64-darwin-20 DEPENDENCIES - activerecord (~> 7.1.0.rc2) + activerecord (~> 7.2.0) minitest pg rails-settings-cached! - railties (~> 7.1.0.rc2) + railties (~> 7.2.0) rake rubocop sqlite3 diff --git a/gemfiles/Gemfile-7-1 b/gemfiles/Gemfile-7-1 index e080189..fa7a149 100644 --- a/gemfiles/Gemfile-7-1 +++ b/gemfiles/Gemfile-7-1 @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "railties", "~> 7.1.0.rc2" -gem "activerecord", "~> 7.1.0.rc2" +gem "railties", "~> 7.1.0" +gem "activerecord", "~> 7.1.0" gem "sqlite3" gemspec path: ".." diff --git a/gemfiles/Gemfile-7-2 b/gemfiles/Gemfile-7-2 new file mode 100644 index 0000000..75bf36d --- /dev/null +++ b/gemfiles/Gemfile-7-2 @@ -0,0 +1,7 @@ +source "https://rubygems.org" + +gem "railties", "~> 7.2.0" +gem "activerecord", "~> 7.2.0" +gem "sqlite3" + +gemspec path: ".." diff --git a/test/dummy/tmp/local_secret.txt b/test/dummy/tmp/local_secret.txt new file mode 100644 index 0000000..1c50546 --- /dev/null +++ b/test/dummy/tmp/local_secret.txt @@ -0,0 +1 @@ +2a04a11f6a1a53493d9043ebb14f6cd1f54cd24dc572f57741883549232e109f5a5a2ff1f3589b1dc71a50e29c7d799e61fed7e4f51b2fc49f18f861538c4e1a \ No newline at end of file