Skip to content

Commit 3c1b3b2

Browse files
committed
Merge branch 'support-ruby-3'
2 parents 4a3a184 + 58d109b commit 3c1b3b2

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ gem 'html-proofer'
1919

2020
# Avoid polling on windows
2121
gem 'wdm', '>= 0.1.0'
22+
23+
# For local Ruby 3 support; works around https://github.com/github/pages-gem/issues/752
24+
gem "webrick", "~> 1.7"

Gemfile.lock

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ GEM
9898
tzinfo-data (1.2018.5)
9999
tzinfo (>= 1.0.0)
100100
wdm (0.1.1)
101+
webrick (1.7.0)
101102
yell (2.2.2)
102103

103104
PLATFORMS
@@ -118,6 +119,7 @@ DEPENDENCIES
118119
tzinfo
119120
tzinfo-data
120121
wdm (>= 0.1.0)
122+
webrick (~> 1.7)
121123

122124
BUNDLED WITH
123125
2.3.6

Rakefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
require 'fileutils'
2+
13
task :clean do
24
sh('rm -rf _site')
35
end
@@ -11,6 +13,12 @@ task :dependencies do
1113
sh('bundle config set --local path "gems"')
1214
end
1315
sh('bundle install')
16+
17+
# Fix pathutil on Ruby 3; works around https://github.com/envygeeks/pathutil/pull/5
18+
# as suggested by https://stackoverflow.com/a/73909894/67873
19+
pathutil_path = `bundle exec gem which pathutil`.chomp()
20+
content = File.read(pathutil_path).gsub(', kwd', ', **kwd')
21+
File.write(pathutil_path, content)
1422
end
1523

1624
task :spelling_dependencies do

0 commit comments

Comments
 (0)