Skip to content

Commit bb12f31

Browse files
authored
Fix release task docs and modern Ruby bundle resolution (#1393)
1 parent 93a5dc4 commit bb12f31

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ It outputs an ironically webpacked couple of files into `lib/assets/react-source
117117
- Update the [changelog](CHANGELOG.md) (find recent changes on GitHub by listing commits or showing closed PRs)
118118
- Regular versions: `bundle exec rake create_release\[2.7.0\]`
119119
- RC versions: `bundle exec rake create_release\[2.7.0.rc.2\]`
120+
- Dry run: `bundle exec rake create_release\[2.7.0,true\]`
120121
- Note, `rake create_release` runs `rake react:update` and `rake ujs:update`
121122

122123
## Styleguides

Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@
33
source "http://rubygems.org"
44

55
gemspec
6+
7+
# Keep development bundle compatible with both Ruby 2.7 CI and newer local Rubies.
8+
# Nokogiri 1.19+ requires Ruby 3.2+, which breaks the repo's Ruby 2.7 matrix.
9+
gem "nokogiri", "~> 1.15.7"

Gemfile.lock

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ GEM
8787
babel-source (>= 4.0, < 6)
8888
execjs (~> 2.0)
8989
builder (3.2.4)
90-
byebug (11.0.1)
90+
byebug (11.1.3)
9191
capybara (3.37.1)
9292
addressable
9393
matrix
@@ -157,7 +157,7 @@ GEM
157157
matrix (0.4.2)
158158
method_source (1.0.0)
159159
mini_mime (1.1.2)
160-
mini_portile2 (2.8.6)
160+
mini_portile2 (2.8.9)
161161
minitest (5.17.0)
162162
minitest-retry (0.2.2)
163163
minitest (>= 5.0)
@@ -172,12 +172,14 @@ GEM
172172
net-smtp (0.5.0)
173173
net-protocol
174174
nio4r (2.7.3)
175-
nokogiri (1.14.3)
176-
mini_portile2 (~> 2.8.0)
175+
nokogiri (1.15.7)
176+
mini_portile2 (~> 2.8.2)
177177
racc (~> 1.4)
178-
nokogiri (1.14.3-x86_64-darwin)
178+
nokogiri (1.15.7-arm64-darwin)
179179
racc (~> 1.4)
180-
nokogiri (1.14.3-x86_64-linux)
180+
nokogiri (1.15.7-x86_64-darwin)
181+
racc (~> 1.4)
182+
nokogiri (1.15.7-x86_64-linux)
181183
racc (~> 1.4)
182184
notiffany (0.1.3)
183185
nenv (~> 0.1)
@@ -190,7 +192,7 @@ GEM
190192
byebug (~> 11.0)
191193
pry (~> 0.10)
192194
public_suffix (4.0.6)
193-
racc (1.6.2)
195+
racc (1.8.1)
194196
rack (2.2.6.4)
195197
rack-test (2.0.2)
196198
rack (>= 1.3)
@@ -256,6 +258,7 @@ GEM
256258
zeitwerk (2.6.6)
257259

258260
PLATFORMS
261+
arm64-darwin-23
259262
ruby
260263
x86_64-darwin-20
261264
x86_64-linux
@@ -273,6 +276,7 @@ DEPENDENCIES
273276
jbuilder
274277
listen (~> 3.0.0)
275278
minitest-retry
279+
nokogiri (~> 1.15.7)
276280
package_json
277281
pry-byebug (~> 3.8.0)
278282
rails (~> 7.0.7, >= 7.0.7.2)

rakelib/create_release.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ desc("Releases both the gem and node package using the given version.
1515
2nd argument: Perform a dry run by passing 'true' as a second argument.
1616
1717
Note, accept defaults for npmjs options. Script will pause to get 2FA tokens.
18-
Example: `rake release[2.1.0,false]`")
18+
Example: `rake create_release[2.1.0,false]`")
1919

2020
task :create_release, %i[gem_version dry_run] do |_t, args|
2121
args_hash = args.to_hash

0 commit comments

Comments
 (0)