Merge pull request #8497 from rubygems/release/bundler_2.6.4_rubygems_3.6.4

Prepare RubyGems 3.6.4 and Bundler 2.6.4

Author: deivid-rodriguez

.codespellrc

@@ -2,4 +2,4 @@
 check-filenames=
 check-hidden=
 ignore-words=.codespellignore
-skip=CODE_OF_CONDUCT.md,*.pem,.git,./bundler/tmp,./bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt,man,vcr_cassettes,vendor,./lib/rubygems/net*,./lib/rubygems/resolv,./lib/rubygems/tsort,./lib/rubygems/timeout,./lib/rubygems/optparse
+skip=CODE_OF_CONDUCT.md,*.pem,.git,./bundler/tmp,./bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt,man,vcr_cassettes,vendor

.github/ISSUE_TEMPLATE/bundler-related-issue.md

@@ -9,15 +9,9 @@ assignees: ''
 
 <!--
 
-Thank you for contributing to the [rubygems](https://github.com/rubygems/rubygems) repository, and specifically to the [Bundler](https://bundler.io/) gem.
+Thank you for contributing to the rubygems) repository, and specifically to the Bundler gem.
 
-Sometimes you can find a solution to your issue by reading some documentation.
-
-* Instructions for common Bundler uses can be found on the [Bundler documentation site](https://bundler.io/).
-* Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](https://bundler.io/man/bundle.1.html) or [Bundler Command Line Reference](https://bundler.io/commands.html).
-* We also have a document detailing solutions to common problems: https://github.com/rubygems/rubygems/blob/master/bundler/doc/TROUBLESHOOTING.md.
-
-If you're still stuck, please fill in the following sections so we can process your issue as fast as possible:
+Please fill in the following sections so we can process your issue as fast as possible
 
 -->
 
@@ -53,7 +47,7 @@ Fill this with a list of steps maintainers can follow to reproduce your issue. N
 
 The more complete the steps to simulate your particular environment are, the easier it will be for maintainers to reproduce your issue on their machines.
 
-Ideally, we recommend you set up the list of steps as a [Dockerfile](https://docs.docker.com/get-started/). A Dockerfile provides a neutral environment that should give the same results, no matter where it's run.
+Ideally, we recommend you set up the list of steps as a Dockerfile. A Dockerfile provides a neutral environment that should give the same results, no matter where it's run.
 
 -->
 

.github/dependabot.yml

@@ -3,7 +3,7 @@ updates:
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:
-      interval: 'weekly'
+      interval: 'monthly'
     groups:
       artifacts:
         patterns:
@@ -13,8 +13,12 @@ updates:
       - '/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib'
       - '/test/rubygems/test_gem_ext_cargo_builder/rust_ruby_example'
     schedule:
-      interval: 'weekly'
+      interval: 'monthly'
     groups:
       rb-sys:
         patterns:
           - 'rb-sys'
+  - package-ecosystem: 'pip'
+    directory: '/.github/workflows/'
+    schedule:
+      interval: 'monthly'

.github/pull_request_template.md

@@ -1,8 +1,6 @@
 <!--
 Thanks so much for the contribution!
 
-Note that you must abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md) to contribute to this project.
-
 To make reviewing this PR a bit easier, please fill out answers to the following questions.
 -->
 
@@ -19,6 +17,6 @@ alternatives, explain why you end up choosing the current implementation -->
 ## Make sure the following tasks are checked
 
 - [ ] Describe the problem / feature
-- [ ] Write [tests](https://github.com/rubygems/rubygems/blob/master/bundler/doc/development/PULL_REQUESTS.md#tests) for features and bug fixes
+- [ ] Write [tests](https://github.com/rubygems/rubygems/blob/master/doc/bundler/development/PULL_REQUESTS.md#tests) for features and bug fixes
 - [ ] Write code to solve the problem
 - [ ] Make sure you follow the [current code style](https://github.com/rubygems/rubygems/blob/master/doc/bundler/development/PULL_REQUESTS.md#code-formatting) and [write meaningful commit messages without tags](https://github.com/rubygems/rubygems/blob/master/doc/bundler/development/PULL_REQUESTS.md#commit-messages)

.github/workflows/bundler.yml

@@ -31,7 +31,7 @@ jobs:
         ruby:
           - { name: ruby-3.1, value: 3.1.6 }
           - { name: ruby-3.2, value: 3.2.6 }
-          - { name: ruby-3.3, value: 3.3.6 }
+          - { name: ruby-3.3, value: 3.3.7 }
           - { name: ruby-3.4, value: 3.4.1 }
 
         bundler:
@@ -41,24 +41,33 @@ jobs:
         include:
           - { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 }, timeout: 90 }
           - { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 }, timeout: 90 }
-          - { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.6 }, timeout: 90 }
+          - { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.7 }, timeout: 90 }
           - { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.1 }, timeout: 90 }
 
           - { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 }, timeout: 150 }
           - { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 }, timeout: 150 }
-          - { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.6 }, timeout: 150 }
+          - { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.7 }, timeout: 150 }
           - { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.1 }, timeout: 150 }
 
+          - { os: { name: Ubuntu, value: ubuntu-24.04 }, bundler: { name: 2, value: '' }, ruby: { name: jruby, value: jruby-9.4.10.0 } }
+          - { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: jruby, value: jruby-9.4.10.0 } }
+
     env:
       RGV: ..
       RUBYOPT: --disable-gems
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup ruby
-        uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
+        uses: ruby/setup-ruby@f2f42b7848feff522ffa488a5236ba0a73bccbdd # v1.219.0
         with:
           ruby-version: ${{ matrix.ruby.value }}
           bundler: none
+      - name: Setup java
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+        with:
+          distribution: temurin
+          java-version: 19.0.2
+        if: matrix.os.name == 'Windows' && matrix.ruby.name == 'jruby'
       - name: Install graphviz (Ubuntu)
         run: sudo apt-get install graphviz -y
         if: matrix.bundler.value == '' && matrix.os.name == 'Ubuntu'
@@ -68,8 +77,23 @@ jobs:
       - name: Prepare dependencies
         run: |
           bin/rake spec:parallel_deps
-      - name: Run Test
+      - name: Run Test (CRuby)
         run: |
           bin/parallel_rspec
         working-directory: ./bundler
+        if: matrix.ruby.name != 'jruby'
+      - name: Run Test (JRuby)
+        run: |
+          bin/parallel_rspec --tag jruby_only --tag jruby
+        working-directory: ./bundler
+        if: matrix.ruby.name == 'jruby' && matrix.os.name == 'Ubuntu'
+      - name: Run a warbler project
+        run: |
+          bin/rake bundler:install:local
+          cd bundler/spec/realworld/fixtures/warbler
+          bundle install
+          bundle exec warble
+          java -jar warbler.jar
+        if: matrix.ruby.name == 'jruby' && matrix.os.name == 'Ubuntu'
+
     timeout-minutes: ${{ matrix.timeout || 60 }}

.github/workflows/daily-bundler.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
+        uses: ruby/setup-ruby@f2f42b7848feff522ffa488a5236ba0a73bccbdd # v1.219.0
         with:
           ruby-version: ruby-head
           bundler: none

.github/workflows/daily-rubygems.yml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
+        uses: ruby/setup-ruby@f2f42b7848feff522ffa488a5236ba0a73bccbdd # v1.219.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler: none

.github/workflows/install-rubygems.yml

@@ -24,17 +24,17 @@ jobs:
         ruby:
           - { name: "3.1", value: 3.1.6 }
           - { name: "3.2", value: 3.2.6 }
-          - { name: "3.3", value: 3.3.6 }
+          - { name: "3.3", value: 3.3.7 }
           - { name: "3.4", value: 3.4.1 }
-          - { name: jruby, value: jruby-9.4.9.0 }
-          - { name: truffleruby, value: truffleruby-24.1.1 }
+          - { name: jruby, value: jruby-9.4.10.0 }
+          - { name: truffleruby, value: truffleruby-24.1.2 }
         openssl:
           - { name: "openssl", value: true }
           - { name: "no-openssl", value: false }
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup ruby
-        uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
+        uses: ruby/setup-ruby@f2f42b7848feff522ffa488a5236ba0a73bccbdd # v1.219.0
         with:
           ruby-version: ${{ matrix.ruby.value }}
           bundler: none
@@ -108,18 +108,18 @@ jobs:
         ruby:
           - { name: "3.1", value: 3.1.6 }
           - { name: "3.2", value: 3.2.6 }
-          - { name: "3.3", value: 3.3.6 }
+          - { name: "3.3", value: 3.3.7 }
           - { name: "3.4", value: 3.4.1 }
-          - { name: jruby-9.4, value: jruby-9.4.9.0, rails-args: "--skip-webpack-install" }
+          - { name: jruby-9.4, value: jruby-9.4.10.0, rails-args: "--skip-webpack-install" }
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup ruby
-        uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
+        uses: ruby/setup-ruby@f2f42b7848feff522ffa488a5236ba0a73bccbdd # v1.219.0
         with:
           ruby-version: ${{ matrix.ruby.value }}
           bundler: none
       - name: Setup java
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: temurin
           java-version: 19.0.2
@@ -154,7 +154,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup original ruby
-        uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
+        uses: ruby/setup-ruby@f2f42b7848feff522ffa488a5236ba0a73bccbdd # v1.219.0
         with:
           ruby-version: 3.2
           bundler: none
@@ -175,7 +175,7 @@ jobs:
           GEM_HOME: bar
           GEM_PATH: bar
       - name: Setup final ruby
-        uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
+        uses: ruby/setup-ruby@f2f42b7848feff522ffa488a5236ba0a73bccbdd # v1.219.0
         with:
           ruby-version: 3.3
           bundler: none

.github/workflows/jruby-bundler.yml

@@ -28,7 +28,7 @@ jobs:
         ruby:
           - { name: ruby-3.1, value: 3.1.6 }
           - { name: ruby-3.2, value: 3.2.6 }
-          - { name: ruby-3.3, value: 3.3.6 }
+          - { name: ruby-3.3, value: 3.3.7 }
           - { name: ruby-3.4, value: 3.4.1 }
 
     steps: