Skip to content

Commit 0ca7427

Browse files
Merge pull request #7839 from rubygems/deivid-rodriguez/test-latest-rubies
Test using latest rubies (cherry picked from commit 41aa6ed)
1 parent 213714b commit 0ca7427

File tree

9 files changed

+40
-38
lines changed

9 files changed

+40
-38
lines changed

.github/workflows/bundler.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@ jobs:
3030

3131
ruby:
3232
- { name: ruby-3.0, value: 3.0.7 }
33-
- { name: ruby-3.1, value: 3.1.5 }
33+
- { name: ruby-3.1, value: 3.1.6 }
3434
- { name: ruby-3.2, value: 3.2.4 }
35-
- { name: ruby-3.3, value: 3.3.1 }
35+
- { name: ruby-3.3, value: 3.3.3 }
3636

3737
bundler:
3838
- { name: 2, value: '' }
3939
- { name: 3, value: 3.0.0 }
4040

4141
include:
4242
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 }, timeout: 90 }
43-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 }, timeout: 90 }
43+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 }, timeout: 90 }
4444
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 }, timeout: 90 }
45-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 }, timeout: 90 }
45+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.3 }, timeout: 90 }
4646

4747
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 }, timeout: 150 }
48-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 }, timeout: 150 }
48+
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 }, timeout: 150 }
4949
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 }, timeout: 150 }
50-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 }, timeout: 150 }
50+
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.3 }, timeout: 150 }
5151

5252
env:
5353
RGV: ..
@@ -70,6 +70,6 @@ jobs:
7070
bin/rake spec:parallel_deps
7171
- name: Run Test
7272
run: |
73-
bin/parallel_rspec
73+
bin/rspec spec/install/gems/standalone_spec.rb:175
7474
working-directory: ./bundler
7575
timeout-minutes: ${{ matrix.timeout || 60 }}

.github/workflows/install-rubygems.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
matrix:
2424
ruby:
2525
- { name: "3.0", value: 3.0.7 }
26-
- { name: "3.1", value: 3.1.5 }
26+
- { name: "3.1", value: 3.1.6 }
2727
- { name: "3.2", value: 3.2.4 }
28-
- { name: "3.3", value: 3.3.1 }
29-
- { name: jruby, value: jruby-9.4.7.0 }
28+
- { name: "3.3", value: 3.3.3 }
29+
- { name: jruby, value: jruby-9.4.8.0 }
3030
- { name: truffleruby, value: truffleruby-24.0.1 }
3131
openssl:
3232
- { name: "openssl", value: true }
@@ -99,10 +99,10 @@ jobs:
9999
fail-fast: false
100100
matrix:
101101
ruby:
102-
- { name: "3.1", value: 3.1.5 } # Rails 7
102+
- { name: "3.1", value: 3.1.6 } # Rails 7
103103
- { name: "3.2", value: 3.2.4 } # Rails 7
104-
- { name: "3.3", value: 3.3.1 } # Rails 7
105-
- { name: jruby-9.4, value: jruby-9.4.7.0, rails-args: "--skip-webpack-install" } # Rails 6
104+
- { name: "3.3", value: 3.3.3 } # Rails 7
105+
- { name: jruby-9.4, value: jruby-9.4.8.0, rails-args: "--skip-webpack-install" } # Rails 6
106106
steps:
107107
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
108108
- name: Setup ruby

.github/workflows/jruby-bundler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup ruby
3737
uses: ruby/setup-ruby@97e35c5302afcf3f5ac1df3fca9343d32536b286 # v1.184.0
3838
with:
39-
ruby-version: jruby-9.4.7.0
39+
ruby-version: jruby-9.4.8.0
4040
bundler: none
4141
- name: Setup java
4242
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1

.github/workflows/realworld-bundler.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ jobs:
2626

2727
ruby:
2828
- { name: ruby-3.0, value: 3.0.7 }
29-
- { name: ruby-3.1, value: 3.1.5 }
29+
- { name: ruby-3.1, value: 3.1.6 }
3030
- { name: ruby-3.2, value: 3.2.4 }
31-
- { name: ruby-3.3, value: 3.3.1 }
31+
- { name: ruby-3.3, value: 3.3.3 }
3232

3333
bundler:
3434
- { name: 2, value: '' }
3535
- { name: 3, value: 3.0.0 }
3636

3737
include:
3838
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 } }
39-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 } }
39+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
4040
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 } }
41-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 } }
41+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.3 } }
4242
env:
4343
RGV: ..
4444
RUBYOPT: --disable-gems
@@ -71,13 +71,13 @@ jobs:
7171
matrix:
7272
include:
7373
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 } }
74-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 } }
74+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
7575
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 } }
76-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 } }
76+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.3 } }
7777
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.7 } }
78-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.5 } }
78+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.6 } }
7979
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.4 } }
80-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.1 } }
80+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.3 } }
8181
steps:
8282
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
8383
- name: Setup ruby
@@ -108,7 +108,7 @@ jobs:
108108
- name: Setup ruby
109109
uses: ruby/setup-ruby@97e35c5302afcf3f5ac1df3fca9343d32536b286 # v1.184.0
110110
with:
111-
ruby-version: 3.3.1
111+
ruby-version: 3.3.3
112112
bundler: none
113113
- name: Prepare dependencies
114114
run: bin/rake setup

.github/workflows/rubygems.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828

2929
ruby:
3030
- { name: "3.0", value: 3.0.7 }
31-
- { name: "3.1", value: 3.1.5 }
31+
- { name: "3.1", value: 3.1.6 }
3232
- { name: "3.2", value: 3.2.4 }
33-
- { name: "3.3", value: 3.3.1 }
33+
- { name: "3.3", value: 3.3.3 }
3434

3535
include:
36-
- ruby: { name: jruby, value: jruby-9.4.7.0 }
36+
- ruby: { name: jruby, value: jruby-9.4.8.0 }
3737
os: { name: Ubuntu, value: ubuntu-22.04 }
3838

3939
- ruby: { name: truffleruby, value: truffleruby-24.0.1 }

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ jobs:
3030
matrix:
3131
include:
3232
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 } }
33-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 } }
33+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
3434
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 } }
35-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 } }
35+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.3 } }
3636
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.7 } }
37-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.5 } }
37+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.6 } }
3838
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.4 } }
39-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.1 } }
39+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.3 } }
4040
steps:
4141
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
4242
- name: Setup ruby

.github/workflows/ubuntu-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup ruby
2626
uses: ruby/setup-ruby@97e35c5302afcf3f5ac1df3fca9343d32536b286 # v1.184.0
2727
with:
28-
ruby-version: 3.3.1
28+
ruby-version: 3.3.3
2929
bundler: none
3030
- name: Install Dependencies
3131
run: bin/rake setup

bundler/spec/install/gems/standalone_spec.rb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,14 @@
143143
before do
144144
skip "Does not work on old Windows Rubies" if Gem.ruby_version < Gem::Version.new("3.2") && Gem.win_platform?
145145

146-
realworld_system_gems "tsort --version 0.1.0"
147-
148-
necessary_system_gems = ["optparse --version 0.1.1", "psych --version 3.3.2", "logger --version 1.4.3", "etc --version 1.2.0", "stringio --version 3.1.0"]
149-
necessary_system_gems += ["shellwords --version 0.1.0", "base64 --version 0.1.0", "resolv --version 0.2.1"] if Gem.rubygems_version < Gem::Version.new("3.3.a")
150-
necessary_system_gems += ["yaml --version 0.1.1"] if Gem.rubygems_version < Gem::Version.new("3.4.a")
151-
realworld_system_gems(*necessary_system_gems, path: scoped_gem_path(bundled_app("bundle")))
146+
necessary_system_gems = ["tsort --version 0.1.0"]
147+
necessary_system_gems += ["etc --version 1.4.3"] if Gem.ruby_version >= Gem::Version.new("3.3.2") && Gem.win_platform?
148+
realworld_system_gems(*necessary_system_gems)
149+
150+
necessary_gems_in_bundle_path = ["optparse --version 0.1.1", "psych --version 3.3.2", "logger --version 1.4.3", "etc --version 1.4.3", "stringio --version 3.1.0"]
151+
necessary_gems_in_bundle_path += ["shellwords --version 0.1.0", "base64 --version 0.1.0", "resolv --version 0.2.1"] if Gem.rubygems_version < Gem::Version.new("3.3.a")
152+
necessary_gems_in_bundle_path += ["yaml --version 0.1.1"] if Gem.rubygems_version < Gem::Version.new("3.4.a")
153+
realworld_system_gems(*necessary_gems_in_bundle_path, path: scoped_gem_path(bundled_app("bundle")))
152154

153155
build_gem "foo", "1.0.0", to_system: true, default: true do |s|
154156
s.add_dependency "bar"

bundler/spec/runtime/setup_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1397,7 +1397,7 @@ def lock_with(ruby_version = nil)
13971397
describe "default gem activation" do
13981398
let(:exemptions) do
13991399
exempts = %w[did_you_mean bundler uri pathname]
1400-
exempts << "etc" if Gem.ruby_version < Gem::Version.new("3.2") && Gem.win_platform?
1400+
exempts << "etc" if (Gem.ruby_version < Gem::Version.new("3.2") || Gem.ruby_version >= Gem::Version.new("3.3.2")) && Gem.win_platform?
14011401
exempts << "set" unless Gem.rubygems_version >= Gem::Version.new("3.2.6")
14021402
exempts << "tsort" unless Gem.rubygems_version >= Gem::Version.new("3.2.31")
14031403
exempts << "error_highlight" # added in Ruby 3.1 as a default gem

0 commit comments

Comments
 (0)