Skip to content

Commit cd65092

Browse files
Merge pull request #8297 from rubygems/deivid-rodriguez/ruby-3-4-0-preview2
Start testing with Ruby 3.4 on every PR
2 parents 5785d6c + 23d0619 commit cd65092

File tree

9 files changed

+23
-8
lines changed

9 files changed

+23
-8
lines changed

.github/workflows/bundler.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
- { name: ruby-3.1, value: 3.1.6 }
3333
- { name: ruby-3.2, value: 3.2.6 }
3434
- { name: ruby-3.3, value: 3.3.6 }
35+
- { name: ruby-3.4, value: 3.4.0-preview2 }
3536

3637
bundler:
3738
- { name: 2, value: '' }
@@ -41,6 +42,7 @@ jobs:
4142
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 }, timeout: 90 }
4243
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 }, timeout: 90 }
4344
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.6 }, timeout: 90 }
45+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-preview2 }, timeout: 90 }
4446

4547
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 }, timeout: 150 }
4648
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 }, timeout: 150 }

.github/workflows/install-rubygems.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
- { name: "3.1", value: 3.1.6 }
2626
- { name: "3.2", value: 3.2.6 }
2727
- { name: "3.3", value: 3.3.6 }
28+
- { name: "3.4", value: 3.4.0-preview2 }
2829
- { name: jruby, value: jruby-9.4.9.0 }
2930
- { name: truffleruby, value: truffleruby-24.0.1 }
3031
openssl:

.github/workflows/realworld-bundler.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
- { name: ruby-3.1, value: 3.1.6 }
2929
- { name: ruby-3.2, value: 3.2.6 }
3030
- { name: ruby-3.3, value: 3.3.6 }
31+
- { name: ruby-3.4, value: 3.4.0-preview2 }
3132

3233
bundler:
3334
- { name: 2, value: '' }
@@ -37,6 +38,7 @@ jobs:
3738
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
3839
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 } }
3940
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.6 } }
41+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-preview2 } }
4042
env:
4143
RGV: ..
4244
RUBYOPT: --disable-gems
@@ -71,9 +73,11 @@ jobs:
7173
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
7274
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 } }
7375
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.6 } }
76+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-preview2 } }
7477
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.6 } }
7578
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.6 } }
7679
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.6 } }
80+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.4, value: 3.4.0-preview2 } }
7781
steps:
7882
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7983
- name: Setup ruby
@@ -104,7 +108,7 @@ jobs:
104108
- name: Setup ruby
105109
uses: ruby/setup-ruby@a2bbe5b1b236842c1cb7dd11e8e3b51e0a616acc # v1.202.0
106110
with:
107-
ruby-version: 3.3.6
111+
ruby-version: 3.4.0-preview2
108112
bundler: none
109113
- name: Prepare dependencies
110114
run: bin/rake setup

.github/workflows/rubygems.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ jobs:
3838
- ruby: { name: truffleruby, value: truffleruby-24.0.1 }
3939
os: { name: Ubuntu, value: ubuntu-24.04 }
4040

41+
- ruby: { name: "3.4", value: 3.4.0-preview2 }
42+
os: { name: Ubuntu, value: ubuntu-24.04 }
43+
44+
- ruby: { name: "3.4", value: 3.4.0-preview2 }
45+
os: { name: macOS, value: macos-14 }
46+
4147
steps:
4248
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4349
- name: Setup ruby
@@ -54,7 +60,7 @@ jobs:
5460
if: matrix.ruby.name != 'truffleruby' && matrix.ruby.name != 'jruby'
5561
- name: Run Test isolatedly
5662
run: bin/rake test:isolated
57-
if: matrix.ruby.name == '3.3' && matrix.os.name != 'Windows'
63+
if: matrix.ruby.name == '3.4' && matrix.os.name != 'Windows'
5864
- name: Run Test (JRuby)
5965
run: JRUBY_OPTS=--debug bin/rake test
6066
if: startsWith(matrix.ruby.name, 'jruby')

.github/workflows/system-rubygems-bundler.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ jobs:
3232
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
3333
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 } }
3434
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.6 } }
35+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-preview2 } }
3536
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.6 } }
3637
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.6 } }
3738
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.6 } }
39+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.4, value: 3.4.0-preview2 } }
3840
steps:
3941
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4042
- name: Setup ruby
@@ -63,10 +65,10 @@ jobs:
6365
with:
6466
path: bundler/tmp/rubygems
6567
ref: ${{ env.RGV }}
66-
if: matrix.ruby.name != 'ruby-3.3'
68+
if: matrix.ruby.name != 'ruby-3.4'
6769
- name: Run Rubygems Requirement tests against local bundler, to make sure bundler monkeypatches preserve the behaviour
6870
run: |
6971
ruby -I../../lib:lib:test test/rubygems/test_gem_requirement.rb
7072
working-directory: ./bundler/tmp/rubygems
71-
if: matrix.ruby.name != 'ruby-3.3'
73+
if: matrix.ruby.name != 'ruby-3.4'
7274
timeout-minutes: 60

.github/workflows/ubuntu-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
ruby:
25-
- { name: ruby, value: 3.3.6 }
25+
- { name: ruby, value: 3.4.0-preview2 }
2626
- { name: truffleruby, value: truffleruby-24.0.1 }
2727
env:
2828
RUBYOPT: -Ilib

bundler/lib/bundler/process_lock.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def self.lock(bundle_path = Bundler.bundle_path, &block)
66
lock_file_path = File.join(bundle_path, "bundler.lock")
77
base_lock_file_path = lock_file_path.delete_suffix(".lock")
88

9-
require "fileutils" if Bundler.rubygems.provides?("< 3.5.23")
9+
require "fileutils" if Bundler.rubygems.provides?("< 3.6.0")
1010

1111
begin
1212
SharedHelpers.filesystem_access(lock_file_path, :write) do

bundler/lib/bundler/rubygems_ext.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ def installed?
442442
end
443443
end
444444

445-
unless Gem.rubygems_version >= Gem::Version.new("3.5.23")
445+
if Gem.rubygems_version < Gem::Version.new("3.6.0")
446446
class Package; end
447447
require "rubygems/package/tar_reader"
448448
require "rubygems/package/tar_reader/entry"

bundler/spec/runtime/setup_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1554,7 +1554,7 @@ def lock_with(ruby_version = nil)
15541554
RUBY
15551555

15561556
expect(last_command.stdboth).not_to include "FAIL"
1557-
expect(err).to include "private method `gem'"
1557+
expect(err).to match(/private method [`']gem'/)
15581558
end
15591559

15601560
it "keeps Kernel#require private" do

0 commit comments

Comments
 (0)