From 3a866e43a7c23840766155346fef066384dff7b4 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Wed, 20 May 2026 13:31:29 +0900 Subject: [PATCH] ci: Revert Bundler 4.0.6 pin and use rubygems: latest in workflows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bundler 4.0.12 (https://blog.rubygems.org/2026/05/20/4.0.12-released.html) includes ruby/rubygems#9544, which fixes the multi-gemspec git source resolver regression tracked in ruby/rubygems#9536 — the bug that PR #290 worked around by pinning Bundler to 4.0.6 in the RuboCop workflow. - Drop the BUNDLER_VERSION env var and the "Pin Bundler to 4.0.6" step from rubocop.yml; the workaround is no longer needed. - Add `rubygems: latest` to the workflows that exercise modern CRuby (rubocop, test, test_11g, test_11g_ojdbc11), matching the pattern release.yml already uses, so CI resolves Bundler 4.0.12 instead of whatever ships in the setup-ruby tarball. setup-ruby handles JRuby via `gem update --system`, so JRuby matrix entries are safe. ruby_head.yml and jruby_head.yml are intentionally left alone — per setup-ruby docs, head builds are not updated. truffleruby.yml and test_gemfiles.yml are also untouched (TruffleRuby compatibility, and test_gemfiles targets Ruby 2.4–3.3 which cannot install RubyGems 4.x). Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/rubocop.yml | 9 +-------- .github/workflows/test.yml | 1 + .github/workflows/test_11g.yml | 1 + .github/workflows/test_11g_ojdbc11.yml | 1 + 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 43d7818..5014549 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -10,8 +10,6 @@ jobs: build: runs-on: ubuntu-latest - env: - BUNDLER_VERSION: 4.0.6 steps: - uses: actions/checkout@v6 @@ -19,12 +17,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: "4.0" - - name: Pin Bundler to 4.0.6 (workaround for ruby/rubygems#9536) - run: | - gem install bundler -v 4.0.6 - ruby --version - gem --version - bundle --version + rubygems: latest - name: Build and run RuboCop run: | BUNDLE_ONLY=rubocop bundle install --jobs 4 --retry 3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4dbfe81..482f482 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,6 +50,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} + rubygems: latest - name: Create symbolic link for libaio library compatibility run: | sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1 diff --git a/.github/workflows/test_11g.yml b/.github/workflows/test_11g.yml index 88a2ddc..17051c6 100644 --- a/.github/workflows/test_11g.yml +++ b/.github/workflows/test_11g.yml @@ -56,6 +56,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} + rubygems: latest - name: Create symbolic link for libaio library compatibility run: | sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1 diff --git a/.github/workflows/test_11g_ojdbc11.yml b/.github/workflows/test_11g_ojdbc11.yml index 3078128..f6457f2 100644 --- a/.github/workflows/test_11g_ojdbc11.yml +++ b/.github/workflows/test_11g_ojdbc11.yml @@ -52,6 +52,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} + rubygems: latest - name: Create symbolic link for libaio library compatibility run: | sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/x86_64-linux-gnu/libaio.so.1