From 21b94bc6b7f833970231d1542a317e2104b2ad0f Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 14 Nov 2025 12:49:06 +0900 Subject: [PATCH] Move gemfiles for 3.5 to 4.0 --- .github/dependabot.yml | 2 +- .github/workflows/main.yml | 8 ++++---- docs/releasing.md | 4 ++-- gemfiles/{3.5 => 4.0}/Gemfile | 0 gemfiles/{3.5 => 4.0}/Gemfile.lock | 0 5 files changed, 7 insertions(+), 7 deletions(-) rename gemfiles/{3.5 => 4.0}/Gemfile (100%) rename gemfiles/{3.5 => 4.0}/Gemfile.lock (100%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b754ef0a8d..2bf235c924 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -24,7 +24,7 @@ updates: - '/gemfiles/3.2' - '/gemfiles/3.3' - '/gemfiles/3.4' - - '/gemfiles/3.5' + - '/gemfiles/4.0' - '/gemfiles/jruby' - '/gemfiles/truffleruby' - '/gemfiles/typecheck' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dd92070b10..041f6c2dab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,7 +104,7 @@ jobs: fail-fast: false matrix: target: - - { ruby: "head", gemfile: "3.5" } + - { ruby: "head", gemfile: "4.0" } - { 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,7 @@ 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: "3.5" } + - { ruby: "head", os: "ubuntu-latest", gemfile: "4.0" } - { 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 +285,7 @@ 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: "3.5" } + - { ruby: "head", os: "macos-latest", gemfile: "4.0" } - { 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 +295,7 @@ 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: "3.5" } + - { ruby: "head", os: "windows-latest", gemfile: "4.0" } - { 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/docs/releasing.md b/docs/releasing.md index 426f5f1132..4af8ea847c 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -40,7 +40,7 @@ ruby -pi -e 'gsub(/^ruby-prism-sys = \{ version = ".+?"/, %Q{ruby-prism-sys = \{ * Update the `Gemfile.lock` file: ```sh -chruby ruby-3.5.0-dev +chruby ruby-4.0.0-dev bundle install ``` @@ -48,7 +48,7 @@ bundle install ```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/3.5/Gemfile" ruby:3.5.0-preview1 bundle update +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 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.5/Gemfile b/gemfiles/4.0/Gemfile similarity index 100% rename from gemfiles/3.5/Gemfile rename to gemfiles/4.0/Gemfile diff --git a/gemfiles/3.5/Gemfile.lock b/gemfiles/4.0/Gemfile.lock similarity index 100% rename from gemfiles/3.5/Gemfile.lock rename to gemfiles/4.0/Gemfile.lock