Skip to content

Commit d9d17d4

Browse files
authored
Merge pull request #3164 from SethTisue/ruby-3.2
Upgrade Ruby and Bundler and gems to match main site
2 parents 6bfcf1a + 8b5afb9 commit d9d17d4

File tree

3 files changed

+68
-33
lines changed

3 files changed

+68
-33
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- name: Set up Ruby
99
uses: ruby/setup-ruby@v1
1010
with:
11-
ruby-version: 3.1.6
11+
ruby-version: 3.2.6
1212
bundler-cache: true
1313
- name: Set up coursier
1414
uses: coursier/[email protected]
@@ -28,6 +28,6 @@ jobs:
2828
--ignore-status-codes "400,401,403,429"\
2929
--ignore-empty-alt\
3030
--allow-hash-href\
31-
--enforce-https=false\
31+
--no-enforce-https\
3232
--ignore-urls '/https://github.com/scala/,/www.oracle.com/'
3333

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM ruby:3.1.6
1+
FROM ruby:3.2.6
22

3-
RUN gem install bundler:2.4.21
3+
RUN gem install bundler:2.6.5
44

55
WORKDIR /srv/jekyll
66

Gemfile.lock

+64-29
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.2.1)
4+
Ascii85 (2.0.1)
5+
activesupport (8.0.1)
56
base64
7+
benchmark (>= 0.3)
68
bigdecimal
79
concurrent-ruby (~> 1.0, >= 1.3.1)
810
connection_pool (>= 2.2.5)
@@ -12,20 +14,34 @@ GEM
1214
minitest (>= 5.1)
1315
securerandom (>= 0.3)
1416
tzinfo (~> 2.0, >= 2.0.5)
17+
uri (>= 0.13.1)
1518
addressable (2.8.7)
1619
public_suffix (>= 2.0.2, < 7.0)
20+
afm (0.2.2)
21+
async (2.23.0)
22+
console (~> 1.29)
23+
fiber-annotation
24+
io-event (~> 1.9)
25+
metrics (~> 0.12)
26+
traces (~> 0.15)
1727
base64 (0.2.0)
18-
bigdecimal (3.1.8)
28+
benchmark (0.4.0)
29+
bigdecimal (3.1.9)
1930
coffee-script (2.4.1)
2031
coffee-script-source
2132
execjs
2233
coffee-script-source (1.12.2)
2334
colorator (1.1.0)
24-
commonmarker (0.23.10)
25-
concurrent-ruby (1.3.4)
26-
connection_pool (2.4.1)
27-
csv (3.3.0)
28-
dnsruby (1.72.2)
35+
commonmarker (0.23.11)
36+
concurrent-ruby (1.3.5)
37+
connection_pool (2.5.0)
38+
console (1.29.3)
39+
fiber-annotation
40+
fiber-local (~> 1.1)
41+
json
42+
csv (3.3.2)
43+
dnsruby (1.72.3)
44+
base64 (~> 0.2.0)
2945
simpleidn (~> 0.2.1)
3046
drb (2.2.1)
3147
em-websocket (0.5.3)
@@ -34,15 +50,20 @@ GEM
3450
ethon (0.16.0)
3551
ffi (>= 1.15.0)
3652
eventmachine (1.2.7)
37-
execjs (2.9.1)
38-
faraday (2.10.1)
39-
faraday-net_http (>= 2.0, < 3.2)
53+
execjs (2.10.0)
54+
faraday (2.12.2)
55+
faraday-net_http (>= 2.0, < 3.5)
56+
json
4057
logger
41-
faraday-net_http (3.1.1)
42-
net-http
43-
ffi (1.17.0-arm64-darwin)
44-
ffi (1.17.0-x64-mingw-ucrt)
45-
ffi (1.17.0-x86_64-linux-gnu)
58+
faraday-net_http (3.4.0)
59+
net-http (>= 0.5.0)
60+
ffi (1.17.1-arm64-darwin)
61+
ffi (1.17.1-x64-mingw-ucrt)
62+
ffi (1.17.1-x86_64-linux-gnu)
63+
fiber-annotation (0.2.0)
64+
fiber-local (1.1.0)
65+
fiber-storage
66+
fiber-storage (1.0.0)
4667
forwardable-extended (2.6.0)
4768
gemoji (4.1.0)
4869
github-pages (232)
@@ -97,21 +118,23 @@ GEM
97118
octokit (>= 4, < 8)
98119
public_suffix (>= 3.0, < 6.0)
99120
typhoeus (~> 1.3)
121+
hashery (2.1.2)
100122
html-pipeline (2.14.3)
101123
activesupport (>= 2)
102124
nokogiri (>= 1.4)
103-
html-proofer (4.4.3)
125+
html-proofer (5.0.10)
104126
addressable (~> 2.3)
105-
mercenary (~> 0.3)
127+
async (~> 2.1)
106128
nokogiri (~> 1.13)
107-
parallel (~> 1.10)
129+
pdf-reader (~> 2.11)
108130
rainbow (~> 3.0)
109131
typhoeus (~> 1.3)
110132
yell (~> 2.0)
111133
zeitwerk (~> 2.5)
112134
http_parser.rb (0.8.0)
113-
i18n (1.14.5)
135+
i18n (1.14.7)
114136
concurrent-ruby (~> 1.0)
137+
io-event (1.9.0)
115138
jekyll (3.10.0)
116139
addressable (~> 2.4)
117140
colorator (~> 1.0)
@@ -222,6 +245,7 @@ GEM
222245
gemoji (>= 3, < 5)
223246
html-pipeline (~> 2.2)
224247
jekyll (>= 3.0, < 5.0)
248+
json (2.10.1)
225249
kramdown (2.4.0)
226250
rexml
227251
kramdown-parser-gfm (1.1.0)
@@ -230,14 +254,15 @@ GEM
230254
listen (3.9.0)
231255
rb-fsevent (~> 0.10, >= 0.10.3)
232256
rb-inotify (~> 0.9, >= 0.9.10)
233-
logger (1.6.0)
257+
logger (1.6.6)
234258
mercenary (0.3.6)
259+
metrics (0.12.1)
235260
minima (2.5.1)
236261
jekyll (>= 3.5, < 5.0)
237262
jekyll-feed (~> 0.9)
238263
jekyll-seo-tag (~> 2.1)
239-
minitest (5.25.1)
240-
net-http (0.4.1)
264+
minitest (5.25.4)
265+
net-http (0.6.0)
241266
uri
242267
nokogiri (1.18.3-arm64-darwin)
243268
racc (~> 1.4)
@@ -248,18 +273,24 @@ GEM
248273
octokit (4.25.1)
249274
faraday (>= 1, < 3)
250275
sawyer (~> 0.9)
251-
parallel (1.22.1)
252276
pathutil (0.16.2)
253277
forwardable-extended (~> 2.6)
278+
pdf-reader (2.14.1)
279+
Ascii85 (>= 1.0, < 3.0, != 2.0.0)
280+
afm (~> 0.2.1)
281+
hashery (~> 2.0)
282+
ruby-rc4
283+
ttfunk
254284
public_suffix (5.1.1)
255285
racc (1.8.1)
256286
rainbow (3.1.1)
257287
rb-fsevent (0.11.2)
258288
rb-inotify (0.11.1)
259289
ffi (~> 1.0)
260-
rexml (3.3.9)
290+
rexml (3.4.1)
261291
rouge (3.30.0)
262-
rubyzip (2.3.2)
292+
ruby-rc4 (0.1.5)
293+
rubyzip (2.4.1)
263294
safe_yaml (1.0.5)
264295
sass (3.7.4)
265296
sass-listen (~> 4.0.0)
@@ -269,23 +300,27 @@ GEM
269300
sawyer (0.9.2)
270301
addressable (>= 2.3.5)
271302
faraday (>= 0.17.3, < 3)
272-
securerandom (0.3.1)
303+
securerandom (0.4.1)
273304
simpleidn (0.2.3)
274305
terminal-table (1.8.0)
275306
unicode-display_width (~> 1.1, >= 1.1.1)
307+
traces (0.15.2)
308+
ttfunk (1.8.0)
309+
bigdecimal (~> 3.1)
276310
typhoeus (1.4.1)
277311
ethon (>= 0.9.0)
278312
tzinfo (2.0.6)
279313
concurrent-ruby (~> 1.0)
280314
unicode-display_width (1.8.0)
281-
uri (0.13.0)
315+
uri (1.0.2)
282316
webrick (1.9.1)
283317
yell (2.2.2)
284-
zeitwerk (2.6.7)
318+
zeitwerk (2.7.2)
285319

286320
PLATFORMS
287321
arm64-darwin-22
288322
arm64-darwin-23
323+
arm64-darwin-24
289324
x64-mingw-ucrt
290325
x86_64-linux
291326

@@ -295,4 +330,4 @@ DEPENDENCIES
295330
webrick
296331

297332
BUNDLED WITH
298-
2.4.21
333+
2.6.5

0 commit comments

Comments
 (0)