From 1974b3aea47b77362f357f776d66d10ec3a722a8 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Wed, 31 Dec 2025 12:17:10 +0100 Subject: [PATCH] Update dependencies/Fix CI/Add Ruby 4.1 --- .github/dependabot.yml | 1 + .github/workflows/main.yml | 11 +++++--- Gemfile.lock | 28 +++++++++---------- bin/prism | 1 + docs/releasing.md | 4 +-- gemfiles/3.2/Gemfile.lock | 6 ++--- gemfiles/3.3/Gemfile.lock | 4 +-- gemfiles/3.4/Gemfile.lock | 4 +-- gemfiles/4.0/Gemfile | 2 +- gemfiles/4.0/Gemfile.lock | 10 +++---- gemfiles/4.1/Gemfile | 17 ++++++++++++ gemfiles/4.1/Gemfile.lock | 55 ++++++++++++++++++++++++++++++++++++++ 12 files changed, 110 insertions(+), 33 deletions(-) create mode 100644 gemfiles/4.1/Gemfile create mode 100644 gemfiles/4.1/Gemfile.lock diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8ea06081e2..1b499e783c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -25,6 +25,7 @@ updates: - '/gemfiles/3.3' - '/gemfiles/3.4' - '/gemfiles/4.0' + - '/gemfiles/4.1' - '/gemfiles/jruby' - '/gemfiles/truffleruby' - '/gemfiles/typecheck' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2035b05b93..c257cf0d15 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,7 +104,7 @@ jobs: fail-fast: false matrix: target: - - { ruby: "head", gemfile: "4.0" } + - { ruby: "head", gemfile: "4.1" } - { ruby: "jruby-10.0.0.0", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923 - { ruby: "truffleruby", gemfile: "truffleruby" } runs-on: ubuntu-latest @@ -275,7 +275,8 @@ jobs: - { ruby: "3.2", os: "ubuntu-latest", gemfile: "3.2" } - { ruby: "3.3", os: "ubuntu-latest", gemfile: "3.3" } - { ruby: "3.4", os: "ubuntu-latest", gemfile: "3.4" } - - { ruby: "head", os: "ubuntu-latest", gemfile: "4.0" } + - { ruby: "4.0", os: "ubuntu-latest", gemfile: "4.0" } + - { ruby: "head", os: "ubuntu-latest", gemfile: "4.1" } - { ruby: "jruby-10.0.0.0", os: "ubuntu-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923 - { ruby: "truffleruby", os: "ubuntu-latest", gemfile: "truffleruby" } @@ -285,7 +286,8 @@ jobs: - { ruby: "3.2", os: "macos-latest", gemfile: "3.2" } - { ruby: "3.3", os: "macos-latest", gemfile: "3.3" } - { ruby: "3.4", os: "macos-latest", gemfile: "3.4" } - - { ruby: "head", os: "macos-latest", gemfile: "4.0" } + - { ruby: "4.0", os: "macos-latest", gemfile: "4.0" } + - { ruby: "head", os: "macos-latest", gemfile: "4.1" } - { ruby: "jruby-10.0.0.0", os: "macos-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923 - { ruby: "truffleruby", os: "macos-latest", gemfile: "truffleruby" } @@ -295,7 +297,8 @@ jobs: - { ruby: "3.2", os: "windows-latest", gemfile: "3.2" } - { ruby: "3.3", os: "windows-latest", gemfile: "3.3" } - { ruby: "3.4", os: "windows-latest", gemfile: "3.4" } - - { ruby: "head", os: "windows-latest", gemfile: "4.0" } + - { ruby: "4.0", os: "windows-latest", gemfile: "4.0" } + # - { ruby: "head", os: "windows-latest", gemfile: "4.1" } TODO: No windows build yet - { ruby: "jruby-10.0.0.0", os: "windows-latest", gemfile: "jruby" } # https://github.com/jruby/jruby/issues/8923 env: BUNDLE_GEMFILE: gemfiles/${{ matrix.target.gemfile }}/Gemfile diff --git a/Gemfile.lock b/Gemfile.lock index 32f4de5b98..13cb8198a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,37 +8,37 @@ GEM specs: ast (2.4.3) benchmark-ips (2.14.0) - date (3.4.1) - erb (5.1.1) - ffi (1.17.2) + date (3.5.1) + erb (6.0.1) + ffi (1.17.3) mini_portile2 (2.8.9) - nokogiri (1.18.10) + nokogiri (1.19.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) onigmo (0.1.0) - parser (3.3.9.0) + parser (3.3.10.0) ast (~> 2.4.1) racc - power_assert (2.0.5) - psych (5.2.6) + power_assert (3.0.1) + psych (5.3.1) date stringio racc (1.8.1) - rake (13.3.0) - rake-compiler (1.3.0) + rake (13.3.1) + rake-compiler (1.3.1) rake - rdoc (6.15.0) + rdoc (7.0.3) erb psych (>= 4.0.0) tsort ruby_memcheck (3.0.1) nokogiri - ruby_parser (3.21.1) + ruby_parser (3.22.0) racc (~> 1.5) sexp_processor (~> 4.16) - sexp_processor (4.17.4) - stringio (3.1.7) - test-unit (3.7.0) + sexp_processor (4.17.5) + stringio (3.2.0) + test-unit (3.7.6) power_assert tsort (0.2.0) diff --git a/bin/prism b/bin/prism index b6301b3dd9..7d8e97fb46 100755 --- a/bin/prism +++ b/bin/prism @@ -100,6 +100,7 @@ module Prism ["3.3", ["3.3"]], ["3.4", ["3.4", "typecheck"]], ["4.0", ["4.0"]], + ["4.1", ["4.1"]], ["jruby", ["jruby"]], ["truffleruby", ["truffleruby"]] ].each do |ruby_version, gemfiles| diff --git a/docs/releasing.md b/docs/releasing.md index 4af8ea847c..0853c2f853 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -47,8 +47,8 @@ bundle install * Update the version-specific lockfiles: ```sh -for VERSION in "2.7" "3.0" "3.1" "3.2" "3.3" "3.4"; do docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/$VERSION/Gemfile" "ruby:$VERSION" bundle update; done -docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/4.0/Gemfile" ruby:4.0.0-preview2 bundle update +for VERSION in "2.7" "3.0" "3.1" "3.2" "3.3" "3.4" "4.0"; do docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/$VERSION/Gemfile" "ruby:$VERSION" bundle update; done +chruby ruby-4.1.0-dev && BUNDLE_GEMFILE=gemfiles/4.1/Gemfile bundle install docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app -e BUNDLE_GEMFILE="gemfiles/jruby/Gemfile" jruby:latest bundle update BUNDLE_GEMFILE=gemfiles/truffleruby/Gemfile chruby-exec truffleruby -- bundle update ``` diff --git a/gemfiles/3.2/Gemfile.lock b/gemfiles/3.2/Gemfile.lock index 390d045dd9..84574fd28b 100644 --- a/gemfiles/3.2/Gemfile.lock +++ b/gemfiles/3.2/Gemfile.lock @@ -9,7 +9,7 @@ GEM ast (2.4.3) logger (1.7.0) mini_portile2 (2.8.9) - nokogiri (1.18.10) + nokogiri (1.19.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) onigmo (0.1.0) @@ -28,7 +28,7 @@ GEM ruby_parser (3.22.0) racc (~> 1.5) sexp_processor (~> 4.16) - sexp_processor (4.17.4) + sexp_processor (4.17.5) test-unit (3.7.6) power_assert @@ -50,4 +50,4 @@ RUBY VERSION ruby 3.2.3p157 BUNDLED WITH - 2.4.19 + 2.6.2 diff --git a/gemfiles/3.3/Gemfile.lock b/gemfiles/3.3/Gemfile.lock index e55992a8af..b7fbf11c47 100644 --- a/gemfiles/3.3/Gemfile.lock +++ b/gemfiles/3.3/Gemfile.lock @@ -9,7 +9,7 @@ GEM ast (2.4.3) logger (1.7.0) mini_portile2 (2.8.9) - nokogiri (1.18.10) + nokogiri (1.19.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) onigmo (0.1.0) @@ -28,7 +28,7 @@ GEM ruby_parser (3.22.0) racc (~> 1.5) sexp_processor (~> 4.16) - sexp_processor (4.17.4) + sexp_processor (4.17.5) test-unit (3.7.6) power_assert diff --git a/gemfiles/3.4/Gemfile.lock b/gemfiles/3.4/Gemfile.lock index 1076f302f2..7f3d61f323 100644 --- a/gemfiles/3.4/Gemfile.lock +++ b/gemfiles/3.4/Gemfile.lock @@ -9,7 +9,7 @@ GEM ast (2.4.3) logger (1.7.0) mini_portile2 (2.8.9) - nokogiri (1.18.10) + nokogiri (1.19.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) onigmo (0.1.0) @@ -28,7 +28,7 @@ GEM ruby_parser (3.22.0) racc (~> 1.5) sexp_processor (~> 4.16) - sexp_processor (4.17.4) + sexp_processor (4.17.5) test-unit (3.7.6) power_assert diff --git a/gemfiles/4.0/Gemfile b/gemfiles/4.0/Gemfile index 85fde92128..f3fef38fe8 100644 --- a/gemfiles/4.0/Gemfile +++ b/gemfiles/4.0/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -ruby ">= 3.5.0.dev" +ruby "~> 4.0.0" gemspec path: "../.." diff --git a/gemfiles/4.0/Gemfile.lock b/gemfiles/4.0/Gemfile.lock index 1b7e4431e8..1c4da8061c 100644 --- a/gemfiles/4.0/Gemfile.lock +++ b/gemfiles/4.0/Gemfile.lock @@ -7,10 +7,10 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.3) - ffi (1.17.2) + ffi (1.17.3) logger (1.7.0) mini_portile2 (2.8.9) - nokogiri (1.18.10) + nokogiri (1.19.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) onigmo (0.1.0) @@ -29,7 +29,7 @@ GEM ruby_parser (3.22.0) racc (~> 1.5) sexp_processor (~> 4.16) - sexp_processor (4.17.4) + sexp_processor (4.17.5) test-unit (3.7.6) power_assert @@ -49,7 +49,7 @@ DEPENDENCIES test-unit RUBY VERSION - ruby 3.5.0.dev + ruby 4.0.0 BUNDLED WITH - 4.0.0.dev + 4.0.3 diff --git a/gemfiles/4.1/Gemfile b/gemfiles/4.1/Gemfile new file mode 100644 index 0000000000..3fde9d4ac1 --- /dev/null +++ b/gemfiles/4.1/Gemfile @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +ruby ">= 4.1.0.dev" + +gemspec path: "../.." + +gem "ffi" +gem "onigmo", platforms: :ruby +gem "parser" +gem "rake-compiler" +gem "rake" +gem "rbs" +gem "ruby_memcheck" +gem "ruby_parser" +gem "test-unit" diff --git a/gemfiles/4.1/Gemfile.lock b/gemfiles/4.1/Gemfile.lock new file mode 100644 index 0000000000..d7103701aa --- /dev/null +++ b/gemfiles/4.1/Gemfile.lock @@ -0,0 +1,55 @@ +PATH + remote: ../.. + specs: + prism (1.7.0) + +GEM + remote: https://rubygems.org/ + specs: + ast (2.4.3) + ffi (1.17.3) + logger (1.7.0) + mini_portile2 (2.8.9) + nokogiri (1.19.0) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + onigmo (0.1.0) + parser (3.3.10.0) + ast (~> 2.4.1) + racc + power_assert (3.0.1) + racc (1.8.1) + rake (13.3.1) + rake-compiler (1.3.1) + rake + rbs (3.10.0) + logger + ruby_memcheck (3.0.1) + nokogiri + ruby_parser (3.22.0) + racc (~> 1.5) + sexp_processor (~> 4.16) + sexp_processor (4.17.5) + test-unit (3.7.6) + power_assert + +PLATFORMS + ruby + +DEPENDENCIES + ffi + onigmo + parser + prism! + rake + rake-compiler + rbs + ruby_memcheck + ruby_parser + test-unit + +RUBY VERSION + ruby 4.1.0.dev + +BUNDLED WITH + 4.1.0.dev