Skip to content

[build] upgrade rules_ruby to 0.28.0 and drop vendored Bazel::Runfiles workaround #17824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
titusfortner merged 1 commit into from
Jul 26, 2026
Merged

[build] upgrade rules_ruby to 0.28.0 and drop vendored Bazel::Runfiles workaround #17824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ bazel_dep(name = "rules_oci", version = "2.3.0")
bazel_dep(name = "rules_pkg", version = "1.2.0")
bazel_dep(name = "rules_python", version = "1.9.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_ruby", version = "0.26.0")
bazel_dep(name = "rules_ruby", version = "0.28.0")
bazel_dep(name = "rules_rs", version = "0.0.96")

single_version_override(
Expand Down
2 changes: 0 additions & 2 deletions rb/Steepfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ target :lib do
'lib/selenium/webdriver/bidi/struct.rb',
# The generator + its up-to-date checker are build tooling, not typed runtime code
'lib/selenium/webdriver/bidi/support/**/*.rb',
# Vendored Bazel::Runfiles (rules_ruby#374); build/test tooling, removed when that ships upstream
'lib/bazel/**/*.rb',
# Ignore all spec files
'spec/**/*.rb',
# Ignore line 166 due to UDP RBS issue
Expand Down
8 changes: 0 additions & 8 deletions rb/lib/bazel/BUILD.bazel
View file
Open in desktop

This file was deleted.

129 changes: 0 additions & 129 deletions rb/lib/bazel/runfiles.rb
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion rb/spec/integration/selenium/webdriver/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ rb_library(
visibility = ["//rb/spec:__subpackages__"],
deps = [
"//rb/lib:selenium-webdriver",
"//rb/lib/bazel:runfiles",
"//rb/lib/selenium:devtools",
"//rb/lib/selenium:server",
"//rb/lib/selenium:webdriver",
Expand All @@ -25,6 +24,7 @@ rb_library(
"//rb/lib/selenium/webdriver:remote",
"//rb/spec:rspec_matchers",
"@bundle",
"@rules_ruby//ruby/runfiles",
],
)

Expand Down
2 changes: 1 addition & 1 deletion rb/support/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ rb_library(
rb_library(
name = "generated_note",
srcs = ["generated_note.rb"],
deps = ["//rb/lib/bazel:runfiles"], # Delete this when updating to rules_ruby 0.28.0
deps = ["@rules_ruby//ruby/runfiles"],
)
11 changes: 0 additions & 11 deletions rb/support/generated_note.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
module GeneratedNote
def self.runfiles
@runfiles ||= begin
ensure_runfiles_on_load_path # Delete this when updating to rules_ruby 0.28.0
require 'bazel/runfiles'
Bazel::Runfiles.create
end
Expand All @@ -39,14 +38,4 @@ def self.render(comment_prefix, generator, command)
text = template.sub('{generator}', generator).sub('{command}', command)
text.rstrip.split("\n").map { |line| "#{comment_prefix} #{line}" }.join("\n")
end

# Delete this when updating to rules_ruby 0.28.0
def self.ensure_runfiles_on_load_path
if (manifest = ENV.fetch('RUNFILES_MANIFEST_FILE', nil)) && File.exist?(manifest)
entry = File.foreach(manifest).find { |line| line.start_with?('_main/rb/lib/bazel/runfiles.rb ') }
$LOAD_PATH.unshift(File.dirname(entry.split(' ', 2).last.chomp, 2)) if entry
elsif (dir = ENV.fetch('RUNFILES_DIR', nil)) && !dir.empty?
$LOAD_PATH.unshift(File.join(dir, '_main', 'rb', 'lib'))
end
end
end
Loading