Skip to content

Commit c4aa612

Browse files
committed
[rb] test new version
1 parent b08130f commit c4aa612

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

.github/workflows/bazel.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,6 @@ jobs:
119119
- name: Set Ruby version
120120
if: inputs.ruby-version != ''
121121
run: echo '${{ inputs.ruby-version }}' > rb/.ruby-version
122-
- name: Disable prebuilt Ruby
123-
if: inputs.ruby-version != '' && inputs.os != 'windows'
124-
run: sed '/^[[:space:]]*rv_version/d' MODULE.bazel > MODULE.bazel.tmp && mv MODULE.bazel.tmp MODULE.bazel
125122
- name: Setup Node
126123
if: inputs.node-version != ''
127124
uses: actions/setup-node@v4

MODULE.bazel

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ single_version_override(
3636

3737
git_override(
3838
module_name = "rules_ruby",
39-
commit = "9c932d9167a54b1ae19b8b30d7d9a81c72d4b6e3",
39+
commit = "def6f129710043bac2276c956df4775b05be6fc1",
4040
remote = "https://github.com/bazel-contrib/rules_ruby",
4141
)
4242

@@ -261,7 +261,7 @@ ruby.toolchain(
261261
"curl",
262262
"libyaml",
263263
],
264-
rv_version = "20260114",
264+
portable_ruby = True,
265265
version_file = "//:rb/.ruby-version",
266266
)
267267
ruby.bundle_fetch(
@@ -285,6 +285,8 @@ ruby.bundle_fetch(
285285
"crack-1.0.1": "ff4a10390cd31d66440b7524eb1841874db86201d5b70032028553130b6d4c7e",
286286
"csv-3.3.5": "6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f",
287287
"curb-1.0.9": "07e5b74a4836103ce186827528f76a22d3991a9b7c45f5c10ee18ee7b03feb0d",
288+
"date-3.5.1": "750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0",
289+
"date-3.5.1-java": "12e09477dc932afe45bf768cd362bf73026804e0db1e6c314186d6cd0bee3344",
288290
"debug-1.11.1": "2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6",
289291
"diff-lcs-1.6.2": "9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962",
290292
"drb-2.2.3": "0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373",
@@ -312,8 +314,8 @@ ruby.bundle_fetch(
312314
"pp-0.6.3": "2951d514450b93ccfeb1df7d021cae0da16e0a7f95ee1e2273719669d0ab9df6",
313315
"prettyprint-0.2.0": "2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193",
314316
"prism-1.8.0": "84453a16ef5530ea62c5f03ec16b52a459575ad4e7b9c2b360fd8ce2c39c1254",
315-
"psych-5.0.1": "43264252cc33b8e626fb940cddc7379d00f7583500680da32c74a54bd9b000d0",
316-
"psych-5.0.1-java": "c4a94895e325d326063f9d53f5e4f231a5df3a6e593ce9563d19b35fe11f800d",
317+
"psych-5.3.1": "eb7a57cef10c9d70173ff74e739d843ac3b2c019a003de48447b2963d81b1974",
318+
"psych-5.3.1-java": "20a4a81ad01479ef060f604ed75ba42fe673169e67d923b1bae5aa4e13cc5820",
317319
"public_suffix-7.0.2": "9114090c8e4e7135c1fd0e7acfea33afaab38101884320c65aaa0ffb8e26a857",
318320
"racc-1.8.1": "4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f",
319321
"racc-1.8.1-java": "54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98",
@@ -358,7 +360,9 @@ ruby.bundle_fetch(
358360
},
359361
gemfile = "//:rb/Gemfile",
360362
gemfile_lock = "//:rb/Gemfile.lock",
361-
ruby_version_file = "//:rb/.ruby-version",
363+
jar_checksums = {
364+
"org.snakeyaml:snakeyaml-engine:2.10": "c99d9fd66c7c251d881a9cd95089b7c8044c29a1b02983d7036981bd4354ec37",
365+
},
362366
)
363367
use_repo(ruby, "bundle", "ruby", "ruby_toolchains")
364368

rb/Gemfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,3 @@ gem 'activesupport', '~> 7.0', require: false, platforms: %i[mri mingw x64_mingw
1010
gem 'curb', '~> 1.0.5', require: false, platforms: %i[mri mingw x64_mingw]
1111
gem 'debug', '~> 1.7', require: false, platforms: %i[mri mingw x64_mingw]
1212
gem 'steep', '~> 1.10.0', require: false, platforms: %i[mri mingw x64_mingw]
13-
14-
# Pin Psych to 5.0.1 because it ships with Ruby 3.2.9 https://stdgems.org/3.2.9/
15-
# This needs to be updated whenever we upgrade to the new version of Ruby
16-
gem 'psych', '5.0.1'

rb/Gemfile.lock

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ GEM
3939
rexml
4040
csv (3.3.5)
4141
curb (1.0.9)
42+
date (3.5.1)
43+
date (3.5.1-java)
4244
debug (1.11.1)
4345
irb (~> 1.10)
4446
reline (>= 0.3.8)
@@ -81,9 +83,11 @@ GEM
8183
prettyprint
8284
prettyprint (0.2.0)
8385
prism (1.8.0)
84-
psych (5.0.1)
86+
psych (5.3.1)
87+
date
8588
stringio
86-
psych (5.0.1-java)
89+
psych (5.3.1-java)
90+
date
8791
jar-dependencies (>= 0.1.7)
8892
public_suffix (7.0.2)
8993
racc (1.8.1)
@@ -201,7 +205,6 @@ DEPENDENCIES
201205
curb (~> 1.0.5)
202206
debug (~> 1.7)
203207
git (~> 1.19)
204-
psych (= 5.0.1)
205208
rack (~> 2.0)
206209
rake (~> 13.0)
207210
rspec (~> 3.0)
@@ -217,4 +220,4 @@ DEPENDENCIES
217220
yard (~> 0.9.11, >= 0.9.36)
218221

219222
BUNDLED WITH
220-
2.4.19
223+
4.0.6

0 commit comments

Comments
 (0)