From 0726139f07ae9cd1edc423bb3ab806c248c0d648 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 11 Mar 2025 12:44:24 +0900 Subject: [PATCH 1/4] bundle up --bundler --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d28536a..5acd950 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,4 +212,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.3.26 + 2.6.5 From f06f8654363e652d0088b678ddb711651ba54caf Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 11 Mar 2025 12:44:33 +0900 Subject: [PATCH 2/4] bundle lock --normalize-platforms --- Gemfile.lock | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 5acd950..385a45a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,6 +119,18 @@ GEM nokogiri (1.16.5) mini_portile2 (~> 2.8.2) racc (~> 1.4) + nokogiri (1.16.5-aarch64-linux) + racc (~> 1.4) + nokogiri (1.16.5-arm-linux) + racc (~> 1.4) + nokogiri (1.16.5-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.5-x86-linux) + racc (~> 1.4) + nokogiri (1.16.5-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.5-x86_64-linux) + racc (~> 1.4) opal (1.7.1) ast (>= 2.3.0) parser (~> 3.0, >= 3.0.3.2) @@ -191,7 +203,13 @@ GEM nokogiri (~> 1.8) PLATFORMS + aarch64-linux + arm-linux + arm64-darwin ruby + x86-linux + x86_64-darwin + x86_64-linux DEPENDENCIES capybara From 8dfaf478e472117f7d37dde55435055b339ade1d Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 11 Mar 2025 12:57:36 +0900 Subject: [PATCH 3/4] Update bundles --- Gemfile | 1 - Gemfile.lock | 216 ++++++++++++++++++++++++++++----------------------- 2 files changed, 117 insertions(+), 100 deletions(-) diff --git a/Gemfile b/Gemfile index 620130f..4f1dcf3 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,6 @@ gem "redcarpet" gem "sass" gem "webrick" gem "terser" -gem "tilt", git: "https://github.com/rtomayko/tilt" group :test do gem "rspec" diff --git a/Gemfile.lock b/Gemfile.lock index 385a45a..cc2b6e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,26 +1,30 @@ -GIT - remote: https://github.com/rtomayko/tilt - revision: b6338e5e6d2be7d57f5d6fdfcb8b1161fe222fb3 - specs: - tilt (2.0.11) - GEM remote: https://rubygems.org/ specs: - activesupport (7.0.7.2) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (8.0.1) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) - backports (3.23.0) - capybara (3.38.0) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) @@ -29,79 +33,89 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.2.2) - contracts (0.17) - cuprite (0.14.3) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + contracts (0.17.2) + cuprite (0.15.1) capybara (~> 3.0) - ferrum (~> 0.13.0) - diff-lcs (1.5.0) - dotenv (2.8.1) + ferrum (~> 0.15.0) + diff-lcs (1.6.0) + dotenv (3.1.7) + drb (2.2.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) - erubis (2.7.0) + erubi (1.13.1) eventmachine (1.2.7) - execjs (2.8.1) + execjs (2.10.0) fast_blank (1.0.1) - fastimage (2.2.6) - ferrum (0.13) + fastimage (2.4.0) + ferrum (0.15) addressable (~> 2.5) concurrent-ruby (~> 1.1) webrick (~> 1.7) - websocket-driver (>= 0.6, < 0.8) - ffi (1.15.5) - haml (5.2.2) - temple (>= 0.8.0) + websocket-driver (~> 0.7) + ffi (1.17.1) + ffi (1.17.1-aarch64-linux-gnu) + ffi (1.17.1-arm-linux-gnu) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86-linux-gnu) + ffi (1.17.1-x86_64-darwin) + ffi (1.17.1-x86_64-linux-gnu) + haml (6.3.0) + temple (>= 0.8.2) + thor tilt hamster (3.0.0) concurrent-ruby (~> 1.0) - hashie (3.6.0) + hashie (5.0.0) http_parser.rb (0.8.0) - i18n (1.6.0) + i18n (1.14.7) concurrent-ruby (~> 1.0) - kramdown (2.4.0) - rexml - listen (3.7.1) + kramdown (2.5.1) + rexml (>= 3.3.9) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.6) matrix (0.4.2) memoist (0.16.2) - middleman (4.4.3) - coffee-script (~> 2.2) - haml (>= 4.0.5, < 6.0) - kramdown (>= 2.3.0) - middleman-cli (= 4.4.3) - middleman-core (= 4.4.3) + middleman (4.6.0) + middleman-cli (= 4.6.0) + middleman-core (= 4.6.0) middleman-blog (4.0.3) addressable (~> 2.3) middleman-core (>= 4.0.0) tzinfo (>= 0.3.0) - middleman-cli (4.4.3) - thor (>= 0.17.0, < 2.0) - middleman-core (4.4.3) - activesupport (>= 6.1, < 7.1) + middleman-cli (4.6.0) + thor (>= 0.17.0, < 1.3.0) + middleman-core (4.6.0) + activesupport (>= 6.1) addressable (~> 2.4) - backports (~> 3.6) bundler (~> 2.0) - contracts (~> 0.13) + coffee-script (~> 2.2) + contracts dotenv - erubis + erubi execjs (~> 2.0) fast_blank fastimage (~> 2.0) + haml (>= 4.0.5) hamster (~> 3.0) - hashie (~> 3.4) - i18n (~> 1.6.0) + hashie (>= 3.4, < 6.0) + i18n (>= 1.6, < 1.15) + kramdown (~> 2.4) listen (~> 3.0) memoist (~> 0.14) padrino-helpers (~> 0.15.0) parallel - rack (>= 1.4.5, < 3) + rack (>= 3) + rackup sassc (~> 2.0) servolux - tilt (~> 2.0.9) + tilt (~> 2.2) toml - uglifier (~> 3.0) + uglifier (>= 3, < 5) webrick middleman-gh-pages (0.4.1) rake (> 0.9.3) @@ -109,74 +123,75 @@ GEM em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) - middleman-syntax (3.3.0) + middleman-syntax (3.4.0) middleman-core (>= 3.2) rouge (~> 3.2) - mini_mime (1.1.2) - mini_portile2 (2.8.6) - minitest (5.19.0) - nio4r (2.7.3) - nokogiri (1.16.5) + mini_mime (1.1.5) + mini_portile2 (2.8.8) + minitest (5.25.4) + nio4r (2.7.4) + nokogiri (1.18.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.16.5-aarch64-linux) - racc (~> 1.4) - nokogiri (1.16.5-arm-linux) + nokogiri (1.18.3-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.16.5-arm64-darwin) + nokogiri (1.18.3-arm-linux-gnu) racc (~> 1.4) - nokogiri (1.16.5-x86-linux) + nokogiri (1.18.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-darwin) + nokogiri (1.18.3-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.18.3-x86_64-linux-gnu) racc (~> 1.4) - opal (1.7.1) + opal (1.8.2) ast (>= 2.3.0) parser (~> 3.0, >= 3.0.3.2) - opal-browser (0.3.3) + opal-browser (0.3.5) opal (>= 1.0, < 2.0) paggio (>= 0.3.0) - padrino-helpers (0.15.2) + padrino-helpers (0.15.3) i18n (>= 0.6.7, < 2) - padrino-support (= 0.15.2) + padrino-support (= 0.15.3) tilt (>= 1.4.1, < 3) - padrino-support (0.15.2) + padrino-support (0.15.3) paggio (0.3.0) - parallel (1.22.1) - parser (3.2.0.0) + parallel (1.26.3) + parser (3.3.7.1) ast (~> 2.4.1) + racc parslet (2.0.0) - public_suffix (5.0.1) - puma (6.4.3) + public_suffix (6.0.1) + puma (6.6.0) nio4r (~> 2.0) - racc (1.7.3) - rack (2.2.13) + racc (1.8.1) + rack (3.1.12) rack-livereload (0.3.17) rack - rack-test (2.0.2) + rack-test (2.2.0) rack (>= 1.3) - rake (13.0.6) + rackup (2.2.1) + rack (>= 3) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - redcarpet (3.5.1) - regexp_parser (2.6.1) - rexml (3.3.9) + redcarpet (3.6.1) + regexp_parser (2.10.0) + rexml (3.4.1) rouge (3.30.0) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.0) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.3) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.2) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.2) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -184,19 +199,23 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) sassc (2.4.0) ffi (~> 1.9) + securerandom (0.4.1) servolux (0.13.0) - temple (0.9.1) - terser (1.1.13) + temple (0.10.3) + terser (1.2.5) execjs (>= 0.3.0, < 3) - thor (1.2.1) + thor (1.2.2) + tilt (2.6.0) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uglifier (3.2.0) + uglifier (4.2.1) execjs (>= 0.3.0, < 3) - webrick (1.8.2) - websocket-driver (0.7.5) + uri (1.0.3) + webrick (1.9.1) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) @@ -226,7 +245,6 @@ DEPENDENCIES rspec sass terser - tilt! webrick BUNDLED WITH From 044a16bbd26244d5f4ca32dd11511e3d5c5d631e Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 11 Mar 2025 12:58:49 +0900 Subject: [PATCH 4/4] Update Ruby 3.4 --- .github/workflows/deploy.yml | 2 +- .github/workflows/test.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b7b83b4..4b27ead 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.2' + ruby-version: '3.4' bundler-cache: true - name: Setup Pages id: pages diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 15223f3..50b596e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,10 +15,9 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: "3.0" + ruby-version: "3.4" bundler-cache: true - name: Run RSpec run: bundle exec rake env: SIMPLIFIED_RUN: "1" -