Skip to content

Commit d10b46b

Browse files
Merge pull request #7059 from rubygems/release/bundler_2.4.21_rubygems_3.4.21
Prepare RubyGems 3.4.21 and Bundler 2.4.21
2 parents de20c7e + 4319b9d commit d10b46b

File tree

198 files changed

+1562
-818
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+1562
-818
lines changed

.github/workflows/bundler.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131

3232
ruby:
3333
- { name: ruby-2.6, value: 2.6.10 }
34-
- { name: ruby-2.7, value: 2.7.7 }
35-
- { name: ruby-3.0, value: 3.0.5 }
36-
- { name: ruby-3.1, value: 3.1.3 }
37-
- { name: ruby-3.2, value: 3.2.1 }
34+
- { name: ruby-2.7, value: 2.7.8 }
35+
- { name: ruby-3.0, value: 3.0.6 }
36+
- { name: ruby-3.1, value: 3.1.4 }
37+
- { name: ruby-3.2, value: 3.2.2 }
3838

3939
bundler:
4040
- { name: 2, value: '' }
@@ -44,15 +44,15 @@ jobs:
4444
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.6, value: 2.6.10 } }
4545

4646
include:
47-
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.5 }, timeout: 90 }
48-
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.3 }, timeout: 90 }
49-
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.7 }, timeout: 90 }
50-
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.1 }, timeout: 90 }
47+
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 }, timeout: 90 }
48+
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 }, timeout: 90 }
49+
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.8 }, timeout: 90 }
50+
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.2 }, timeout: 90 }
5151

52-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.7 }, timeout: 150 }
53-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.5 }, timeout: 150 }
54-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.3 }, timeout: 150 }
55-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.1 }, timeout: 150 }
52+
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.8 }, timeout: 150 }
53+
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 }, timeout: 150 }
54+
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 }, timeout: 150 }
55+
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.2 }, timeout: 150 }
5656

5757
env:
5858
RGV: ..

.github/workflows/install-rubygems.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
matrix:
2525
ruby:
2626
- { name: "2.6", value: 2.6.10 }
27-
- { name: "2.7", value: 2.7.7 }
28-
- { name: "3.0", value: 3.0.5 }
29-
- { name: "3.1", value: 3.1.3 }
30-
- { name: "3.2", value: 3.2.1 }
27+
- { name: "2.7", value: 2.7.8 }
28+
- { name: "3.0", value: 3.0.6 }
29+
- { name: "3.1", value: 3.1.4 }
30+
- { name: "3.2", value: 3.2.2 }
3131
- { name: jruby-9.4, value: jruby-9.4.2.0 }
3232
- { name: truffleruby-22, value: truffleruby-22.3.0 }
3333
openssl:
@@ -98,8 +98,8 @@ jobs:
9898
fail-fast: false
9999
matrix:
100100
ruby:
101-
- { name: "3.1", value: 3.1.3 } # Rails 7
102-
- { name: "3.2", value: 3.2.1 } # Rails 7
101+
- { name: "3.1", value: 3.1.4 } # Rails 7
102+
- { name: "3.2", value: 3.2.2 } # Rails 7
103103
- { name: jruby-9.4, value: jruby-9.4.2.0, rails-args: "--skip-webpack-install" } # Rails 6
104104
steps:
105105
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
@@ -124,7 +124,7 @@ jobs:
124124
run: bundle init && bundle add fileutils --git https://github.com/ruby/fileutils
125125
shell: bash
126126
- name: Generate a Rails application
127-
run: gem install rails && rails new foo ${{ matrix.ruby.rails-args }}
127+
run: gem install rails --version 7.0.8 && rails new foo ${{ matrix.ruby.rails-args }}
128128
shell: bash
129129

130130
timeout-minutes: 20

.github/workflows/realworld-bundler.yml

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

2727
ruby:
2828
- { name: ruby-2.6, value: 2.6.10 }
29-
- { name: ruby-2.7, value: 2.7.7 }
30-
- { name: ruby-3.0, value: 3.0.5 }
31-
- { name: ruby-3.1, value: 3.1.3 }
32-
- { name: ruby-3.2, value: 3.2.1 }
29+
- { name: ruby-2.7, value: 2.7.8 }
30+
- { name: ruby-3.0, value: 3.0.6 }
31+
- { name: ruby-3.1, value: 3.1.4 }
32+
- { name: ruby-3.2, value: 3.2.2 }
3333

3434
bundler:
3535
- { name: 2, value: '' }
@@ -39,10 +39,10 @@ jobs:
3939
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.6, value: 2.6.10 } }
4040

4141
include:
42-
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.7 } }
43-
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.5 } }
44-
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.3 } }
45-
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.1 } }
42+
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.8 } }
43+
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 } }
44+
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 } }
45+
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.2 } }
4646
env:
4747
RGV: ..
4848
RUBYOPT: --disable-gems
@@ -75,14 +75,14 @@ jobs:
7575
matrix:
7676
include:
7777
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.10 } }
78-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.7 } }
79-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.5 } }
80-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.3 } }
81-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.1 } }
82-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.7 } }
83-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.5 } }
84-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.3 } }
85-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.1 } }
78+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.8 } }
79+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 } }
80+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 } }
81+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.2 } }
82+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.8 } }
83+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.6 } }
84+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.4 } }
85+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.2 } }
8686
steps:
8787
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
8888
- name: Setup ruby
@@ -113,7 +113,7 @@ jobs:
113113
- name: Setup ruby
114114
uses: ruby/setup-ruby@5311f05890856149502132d25c4a24985a00d426 # v1.153.0
115115
with:
116-
ruby-version: 3.2.1
116+
ruby-version: 3.2.2
117117
bundler: none
118118
- name: Download all used cassettes as artifacts
119119
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2

.github/workflows/rubygems.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ jobs:
2929

3030
ruby:
3131
- { name: "2.6", value: 2.6.10 }
32-
- { name: "2.7", value: 2.7.7 }
33-
- { name: "3.0", value: 3.0.5 }
34-
- { name: "3.1", value: 3.1.3 }
35-
- { name: "3.2", value: 3.2.1 }
32+
- { name: "2.7", value: 2.7.8 }
33+
- { name: "3.0", value: 3.0.6 }
34+
- { name: "3.1", value: 3.1.4 }
35+
- { name: "3.2", value: 3.2.2 }
3636

3737
include:
38-
- ruby: { name: "3.2", value: 3.2.1 }
38+
- ruby: { name: "3.2", value: 3.2.2 }
3939
os: { name: macOS, value: macos-12 }
4040

4141
- ruby: { name: jruby-9.4, value: jruby-9.4.2.0 }

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ jobs:
3232
matrix:
3333
include:
3434
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.10 } }
35-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.7 } }
36-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.5 } }
37-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.3 } }
38-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.1 } }
39-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.7 } }
40-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.5 } }
41-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.3 } }
42-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.1 } }
35+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.8 } }
36+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 } }
37+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 } }
38+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.2 } }
39+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.8 } }
40+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.6 } }
41+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.4 } }
42+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.2 } }
4343
steps:
4444
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
4545
- name: Setup ruby

.github/workflows/ubuntu-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup ruby
2727
uses: ruby/setup-ruby@5311f05890856149502132d25c4a24985a00d426 # v1.153.0
2828
with:
29-
ruby-version: 3.2.1
29+
ruby-version: 3.2.2
3030
bundler: none
3131
- name: Install Dependencies
3232
run: rake setup

.rubocop.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,15 @@ Performance/StringReplacement:
142142
Security/Open:
143143
Enabled: true
144144

145+
Style/NumericLiteralPrefix:
146+
Enabled: true
147+
148+
Style/RescueStandardError:
149+
Enabled: true
150+
151+
Style/RescueModifier:
152+
Enabled: true
153+
145154
Style/Next:
146155
Enabled: true
147156

@@ -167,6 +176,13 @@ Style/NumericLiterals:
167176
Style/ClassCheck:
168177
Enabled: true
169178

179+
Style/ParallelAssignment:
180+
Enabled: true
181+
182+
Style/StringLiteralsInInterpolation:
183+
Enabled: true
184+
EnforcedStyle: double_quotes
185+
170186
Style/AndOr:
171187
Enabled: true
172188
EnforcedStyle: always

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
# 3.4.21 / 2023-10-17
2+
3+
## Enhancements:
4+
5+
* Abort `setup.rb` if Ruby is too old. Pull request
6+
[#7011](https://github.com/rubygems/rubygems/pull/7011) by
7+
deivid-rodriguez
8+
* Remove usage of Dir.chdir that only execute a subprocess. Pull request
9+
[#6930](https://github.com/rubygems/rubygems/pull/6930) by segiddins
10+
* Freeze more strings in generated gemspecs. Pull request
11+
[#6974](https://github.com/rubygems/rubygems/pull/6974) by segiddins
12+
* Use pure-ruby YAML parser for loading configuration at RubyGems. Pull
13+
request [#6615](https://github.com/rubygems/rubygems/pull/6615) by hsbt
14+
* Installs bundler 2.4.21 as a default gem.
15+
16+
## Documentation:
17+
18+
* Update suggested variable for bindir. Pull request
19+
[#7028](https://github.com/rubygems/rubygems/pull/7028) by hsbt
20+
* Fix invalid links in documentation. Pull request
21+
[#7008](https://github.com/rubygems/rubygems/pull/7008) by simi
22+
123
# 3.4.20 / 2023-09-27
224

325
## Enhancements:

Manifest.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@ lib/rubygems/util/list.rb
545545
lib/rubygems/validator.rb
546546
lib/rubygems/version.rb
547547
lib/rubygems/version_option.rb
548+
lib/rubygems/yaml_serializer.rb
548549
rubygems-update.gemspec
549550
setup.rb
550551
test/rubygems/alternate_cert.pem

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ namespace "guides" do
387387
task "commit" => %w[../guides.rubygems.org] do
388388
chdir "../guides.rubygems.org" do
389389
sh "git", "diff", "--quiet"
390-
rescue
390+
rescue StandardError
391391
sh "git", "commit", "command-reference.md", "specification-reference.md",
392392
"-m", "Rebuild for RubyGems #{v}"
393393
end

0 commit comments

Comments
 (0)