Skip to content

Commit 5210d96

Browse files
committed
Merge branch 'support-ruby-3'
2 parents c5f9ed5 + 50c61f0 commit 5210d96

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

Gemfile

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

1515
# Avoid polling on windows
1616
gem 'wdm', '>= 0.1.0'
17+
18+
# For local Ruby 3 support; works around https://github.com/github/pages-gem/issues/752
19+
gem "webrick", "~> 1.7"

Gemfile.lock

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ GEM
8686
typhoeus (1.4.0)
8787
ethon (>= 0.9.0)
8888
wdm (0.1.1)
89+
webrick (1.7.0)
8990
yell (2.2.2)
9091
zeitwerk (2.6.1)
9192

@@ -102,6 +103,7 @@ DEPENDENCIES
102103
neat
103104
rake
104105
wdm (>= 0.1.0)
106+
webrick (~> 1.7)
105107

106108
BUNDLED WITH
107109
1.17.3

Rakefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
require 'fileutils'
12
require 'set'
23
require 'yaml'
34

@@ -15,6 +16,12 @@ task :dependencies do
1516
else
1617
sh('bundle install --path gems')
1718
end
19+
20+
# Fix pathutil on Ruby 3; works around https://github.com/envygeeks/pathutil/pull/5
21+
# as suggested by https://stackoverflow.com/a/73909894/67873
22+
pathutil_path = `bundle exec gem which pathutil`.strip()
23+
content = File.read(pathutil_path).gsub(', kwd', ', **kwd')
24+
File.write(pathutil_path, content)
1825
end
1926

2027
task :spelling_dependencies do

0 commit comments

Comments
 (0)