Skip to content

Commit b2efa89

Browse files
committed
ci: pin truffleruby json appraisals
1 parent 7deb46d commit b2efa89

8 files changed

Lines changed: 31 additions & 4 deletions

File tree

Appraisals

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ appraise "ruby-2-7" do
104104
end
105105

106106
appraise "ruby-3-0" do
107+
eval_gemfile "modular/json/truffleruby_22_3.gemfile"
108+
eval_gemfile "modular/json/truffleruby_23_0.gemfile"
107109
eval_gemfile "modular/x_std_libs/r3.1/libs.gemfile"
108110
eval_gemfile "modular/faraday_v2.gemfile"
109111
eval_gemfile "modular/hashie_v5.gemfile"
@@ -124,8 +126,8 @@ appraise "ruby-3-1" do
124126
end
125127

126128
appraise "ruby-3-2" do
129+
eval_gemfile "modular/json/truffleruby_23_1.gemfile"
127130
eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
128-
gem "json", "< 2.19"
129131
eval_gemfile "modular/faraday_v2.gemfile"
130132
eval_gemfile "modular/hashie_v5.gemfile"
131133
eval_gemfile "modular/jwt_v2.gemfile"

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ Please file a bug if you notice a violation of semantic versioning.
3333
- Marked generated EOL TruffleRuby 22.3, 23.0, and 23.1 matrix entries
3434
experimental so native extension build failures do not fail the whole
3535
workflow.
36+
- Pinned `json` only for EOL TruffleRuby appraisal bundles, matching the
37+
default `json` gem shipped with each TruffleRuby release instead of
38+
constraining MRI Ruby appraisal bundles.
3639

3740
### Security
3841

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# frozen_string_literal: true
2+
3+
if RUBY_ENGINE == "truffleruby" && RUBY_ENGINE_VERSION.start_with?("22.3")
4+
# TruffleRuby 22.3 ships the json default gem from its emulated MRI Ruby.
5+
gem "json", "= 2.5.1"
6+
end
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# frozen_string_literal: true
2+
3+
if RUBY_ENGINE == "truffleruby" && RUBY_ENGINE_VERSION.start_with?("23.0")
4+
# TruffleRuby 23.0 ships the json default gem from its emulated MRI Ruby.
5+
gem "json", "= 2.6.1"
6+
end
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# frozen_string_literal: true
2+
3+
if RUBY_ENGINE == "truffleruby" && RUBY_ENGINE_VERSION.start_with?("23.1")
4+
# TruffleRuby 23.1 ships the json default gem from its emulated MRI Ruby.
5+
gem "json", "= 2.6.3"
6+
end

gemfiles/ruby_3_0.gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ source "https://gem.coop"
44

55
gemspec :path => "../"
66

7+
eval_gemfile("modular/json/truffleruby_22_3.gemfile")
8+
9+
eval_gemfile("modular/json/truffleruby_23_0.gemfile")
10+
711
eval_gemfile("modular/x_std_libs/r3.1/libs.gemfile")
812

913
eval_gemfile("modular/faraday_v2.gemfile")

gemfiles/ruby_3_2.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
source "https://gem.coop"
44

5-
gem "json", "< 2.19"
6-
75
gemspec :path => "../"
86

7+
eval_gemfile("modular/json/truffleruby_23_1.gemfile")
8+
99
eval_gemfile("modular/x_std_libs/r3/libs.gemfile")
1010

1111
eval_gemfile("modular/faraday_v2.gemfile")

mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ _.file = { path = ".env.local", redact = true }
2525
_.source = ".config/mise/env.sh"
2626

2727
[tools]
28-
ruby = "4.0.4"
28+
ruby = "4.0.5"

0 commit comments

Comments
 (0)