Skip to content

Commit e2865d5

Browse files
authored
Merge pull request rails#44152 from Shopify/ruby-head-ci
Fix ruby-head CI
2 parents 90e0b2b + c2da0ad commit e2865d5

File tree

2 files changed

+30
-16
lines changed

2 files changed

+30
-16
lines changed

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
66

77
gemspec
88

9+
gem "rbtree", github: "zzak/rbtree" # Ruby 3.2 compatibility
10+
911
gem "minitest", ">= 5.15.0"
1012

1113
# We need a newish Rake since Active Job sets its test tasks' descriptions.
@@ -108,7 +110,7 @@ end
108110

109111
# Action View
110112
group :view do
111-
gem "blade", require: false, platforms: [:ruby]
113+
gem "blade", github: "casperisfine/blade", branch: "ruby-3.2-compat", require: false, platforms: [:ruby]
112114
gem "sprockets-export", require: false
113115
end
114116

Gemfile.lock

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,24 @@ GIT
44
specs:
55
mysql2 (0.5.3)
66

7+
GIT
8+
remote: https://github.com/casperisfine/blade.git
9+
revision: cae7c6294ba9b99d6e494867fd3d8f3a1e1a0b7c
10+
branch: ruby-3.2-compat
11+
specs:
12+
blade (0.7.2)
13+
activesupport (>= 3.0.0)
14+
blade-qunit_adapter (>= 2.0.1)
15+
coffee-script
16+
coffee-script-source
17+
curses (>= 1.4.0)
18+
eventmachine
19+
faye
20+
sprockets (>= 3.0)
21+
thin (>= 1.6.0)
22+
thor (>= 0.19.1)
23+
useragent (>= 0.16.7)
24+
725
GIT
826
remote: https://github.com/jhawthorn/queue_classic.git
927
revision: dbfee9bda71020b8f11ae8d9b85932462b7fbee0
@@ -21,6 +39,12 @@ GIT
2139
event_emitter
2240
websocket
2341

42+
GIT
43+
remote: https://github.com/zzak/rbtree.git
44+
revision: 6f678e50f543c43d25c018ae108c7e3de88b703a
45+
specs:
46+
rbtree (0.4.4)
47+
2448
PATH
2549
remote: .
2650
specs:
@@ -152,18 +176,6 @@ GEM
152176
bcrypt (3.1.16)
153177
beaneater (1.1.1)
154178
benchmark-ips (2.9.2)
155-
blade (0.7.2)
156-
activesupport (>= 3.0.0)
157-
blade-qunit_adapter (>= 2.0.1)
158-
coffee-script
159-
coffee-script-source
160-
curses (>= 1.4.0)
161-
eventmachine
162-
faye
163-
sprockets (>= 3.0)
164-
thin (>= 1.6.0)
165-
thor (>= 0.19.1)
166-
useragent (>= 0.16.7)
167179
blade-qunit_adapter (2.0.1)
168180
bootsnap (1.9.3)
169181
msgpack (~> 1.0)
@@ -193,7 +205,7 @@ GEM
193205
crass (1.0.6)
194206
cssbundling-rails (1.0.0)
195207
railties (>= 6.0.0)
196-
curses (1.4.2)
208+
curses (1.4.3)
197209
daemons (1.4.1)
198210
dalli (3.2.0)
199211
dante (0.2.0)
@@ -412,7 +424,6 @@ GEM
412424
rb-fsevent (0.11.0)
413425
rb-inotify (0.10.1)
414426
ffi (~> 1.0)
415-
rbtree (0.4.4)
416427
rdoc (6.3.3)
417428
redcarpet (3.2.3)
418429
redis (4.5.1)
@@ -581,7 +592,7 @@ DEPENDENCIES
581592
backburner
582593
bcrypt (~> 3.1.11)
583594
benchmark-ips
584-
blade
595+
blade!
585596
bootsnap (>= 1.4.4)
586597
capybara (>= 3.26)
587598
connection_pool
@@ -615,6 +626,7 @@ DEPENDENCIES
615626
rack-cache (~> 1.2)
616627
rails!
617628
rake (>= 11.1)
629+
rbtree!
618630
redcarpet (~> 3.2.3)
619631
redis (~> 4.0)
620632
redis-namespace

0 commit comments

Comments
 (0)