Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .github/workflows/bazel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ jobs:
- name: Set Ruby version
if: inputs.ruby-version != ''
run: echo '${{ inputs.ruby-version }}' > rb/.ruby-version
- name: Disable prebuilt Ruby
if: inputs.ruby-version != '' && inputs.os != 'windows'
run: sed '/^[[:space:]]*rv_version/d' MODULE.bazel > MODULE.bazel.tmp && mv MODULE.bazel.tmp MODULE.bazel
- name: Setup Node
if: inputs.node-version != ''
uses: actions/setup-node@v4
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ jobs:
browser: ${{ matrix.browser }}
os: ${{ matrix.os }}
rerun-with-debug: true
ruby-version: 3.2.9
run: >
bazel test
--keep_going
Expand Down
1 change: 1 addition & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
load("@aspect_rules_js//npm:defs.bzl", "npm_link_package")
load("@buildifier_prebuilt//:rules.bzl", "buildifier")
load("@npm//:defs.bzl", "npm_link_all_packages")
load("@rules_java//java:java_binary.bzl", "java_binary")
load("//common:browsers.bzl", "chrome_data", "firefox_data")
load("//java:browsers.bzl", "chrome_jvm_flags", "firefox_jvm_flags")
load("//java:defs.bzl", "artifact")
Expand Down
15 changes: 10 additions & 5 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ single_version_override(
patches = ["//java:rules_jvm_external_javadoc.patch"],
)

git_override(
module_name = "rules_ruby",
commit = "9c932d9167a54b1ae19b8b30d7d9a81c72d4b6e3",
remote = "https://github.com/bazel-contrib/rules_ruby",
)

multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
multitool.hub(lockfile = "//:multitool.lock.json")
use_repo(multitool, "multitool")
Expand Down Expand Up @@ -255,7 +261,7 @@ ruby.toolchain(
"curl",
"libyaml",
],
ruby_build_version = "20260110",
rv_version = "20260114",
version_file = "//:rb/.ruby-version",
)
ruby.bundle_fetch(
Expand All @@ -279,8 +285,6 @@ ruby.bundle_fetch(
"crack-1.0.1": "ff4a10390cd31d66440b7524eb1841874db86201d5b70032028553130b6d4c7e",
"csv-3.3.5": "6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f",
"curb-1.0.9": "07e5b74a4836103ce186827528f76a22d3991a9b7c45f5c10ee18ee7b03feb0d",
"date-3.5.1": "750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0",
"date-3.5.1-java": "12e09477dc932afe45bf768cd362bf73026804e0db1e6c314186d6cd0bee3344",
"debug-1.11.1": "2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6",
"diff-lcs-1.6.2": "9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962",
"drb-2.2.3": "0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373",
Expand Down Expand Up @@ -308,8 +312,8 @@ ruby.bundle_fetch(
"pp-0.6.3": "2951d514450b93ccfeb1df7d021cae0da16e0a7f95ee1e2273719669d0ab9df6",
"prettyprint-0.2.0": "2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193",
"prism-1.8.0": "84453a16ef5530ea62c5f03ec16b52a459575ad4e7b9c2b360fd8ce2c39c1254",
"psych-5.3.1": "eb7a57cef10c9d70173ff74e739d843ac3b2c019a003de48447b2963d81b1974",
"psych-5.3.1-java": "20a4a81ad01479ef060f604ed75ba42fe673169e67d923b1bae5aa4e13cc5820",
"psych-5.0.1": "43264252cc33b8e626fb940cddc7379d00f7583500680da32c74a54bd9b000d0",
"psych-5.0.1-java": "c4a94895e325d326063f9d53f5e4f231a5df3a6e593ce9563d19b35fe11f800d",
"public_suffix-7.0.2": "9114090c8e4e7135c1fd0e7acfea33afaab38101884320c65aaa0ffb8e26a857",
"racc-1.8.1": "4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f",
"racc-1.8.1-java": "54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98",
Expand Down Expand Up @@ -354,6 +358,7 @@ ruby.bundle_fetch(
},
gemfile = "//:rb/Gemfile",
gemfile_lock = "//:rb/Gemfile.lock",
ruby_version_file = "//:rb/.ruby-version",
)
use_repo(ruby, "bundle", "ruby", "ruby_toolchains")

Expand Down
1 change: 1 addition & 0 deletions common/remote-build/cc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

# This becomes the BUILD file for @local_config_cc// under non-BSD unixes.

load("@rules_cc//cc:cc_library.bzl", "cc_library")
load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite")
load(":armeabi_cc_toolchain_config.bzl", "armeabi_cc_toolchain_config")
load(":cc_toolchain_config.bzl", "cc_toolchain_config")
Expand Down
1 change: 1 addition & 0 deletions common/remote-build/cc/armeabi_cc_toolchain_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ load(
"feature",
"tool_path",
)
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")

def _impl(ctx):
toolchain_identifier = "stub_armeabi-v7a"
Expand Down
1 change: 1 addition & 0 deletions common/remote-build/cc/cc_toolchain_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ load(
"variable_with_value",
"with_feature_set",
)
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")

def layering_check_features(compiler):
if compiler != "clang":
Expand Down
2 changes: 2 additions & 0 deletions cpp/linux-specific/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")

cc_binary(
name = "noblur64",
srcs = glob([
Expand Down
2 changes: 2 additions & 0 deletions java/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
load("@contrib_rules_jvm//java:defs.bzl", "spotbugs_binary", "spotbugs_config")
load("@rules_java//java:java_library.bzl", "java_library")
load("@rules_java//java:java_plugin.bzl", "java_plugin")
load(":defs.bzl", "artifact")

exports_files(
Expand Down
1 change: 1 addition & 0 deletions java/private/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_java//java:java_binary.bzl", "java_binary")
load("@rules_jvm_external//:defs.bzl", "artifact")

exports_files(
Expand Down
1 change: 1 addition & 0 deletions java/private/common.bzl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("//java/private:module.bzl", "JavaModuleInfo")

MavenInfo = provider(
Expand Down
1 change: 1 addition & 0 deletions java/private/dist_info.bzl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_java//java/common:java_info.bzl", "JavaInfo")
load("//java/private:common.bzl", "MavenInfo", "explode_coordinates", "read_coordinates")
load("//java/private:module.bzl", "JavaModuleInfo")

Expand Down
3 changes: 3 additions & 0 deletions java/private/module.bzl
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
load("@rules_java//java/common:java_common.bzl", "java_common")
load("@rules_java//java/common:java_info.bzl", "JavaInfo")

_GatheredModuleInfo = provider(
fields = {
"name": "Name of the module, may be `None`.",
Expand Down
1 change: 1 addition & 0 deletions java/test/org/openqa/selenium/firefox/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_java//java:java_library.bzl", "java_library")
load("@rules_jvm_external//:defs.bzl", "artifact")
load("//common:defs.bzl", "copy_file")
load("//java:defs.bzl", "JUNIT5_DEPS", "java_selenium_test_suite", "java_test_suite")
Expand Down
1 change: 1 addition & 0 deletions java/test/org/openqa/selenium/grid/router/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_java//java:java_library.bzl", "java_library")
load("@rules_jvm_external//:defs.bzl", "artifact")
load("//java:defs.bzl", "BIDI_BROWSERS", "JUNIT5_DEPS", "SINGLE_BROWSER", "java_selenium_test_suite", "java_test_suite")
load("//java:version.bzl", "TOOLS_JAVA_VERSION")
Expand Down
1 change: 1 addition & 0 deletions java/test/org/openqa/selenium/netty/server/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_java//java:java_library.bzl", "java_library")
load("@rules_jvm_external//:defs.bzl", "artifact")
load("//java:defs.bzl", "JUNIT5_DEPS", "java_test_suite")

Expand Down
1 change: 1 addition & 0 deletions javascript/grid-ui/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ load("@aspect_rules_jest//jest:defs.bzl", "jest_test")
load("@aspect_rules_js//js:defs.bzl", "js_library")
load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
load("@npm//:defs.bzl", "npm_link_all_packages")
load("@rules_java//java:java_import.bzl", "java_import")
load("@rules_pkg//pkg:zip.bzl", "pkg_zip")
load("//java:defs.bzl", "merge_jars")

Expand Down
1 change: 1 addition & 0 deletions javascript/grid-ui/public/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_java//java:java_import.bzl", "java_import")
load("@rules_pkg//pkg:zip.bzl", "pkg_zip")

pkg_zip(
Expand Down
4 changes: 2 additions & 2 deletions javascript/private/test_suite.bzl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
load("@rules_java//java:java_binary.bzl", "java_binary")
load("@rules_jvm_external//:defs.bzl", "artifact")
load("//java:defs.bzl", "selenium_test")

Expand Down Expand Up @@ -28,8 +29,7 @@ def closure_test_suite(name, data = [], browsers = None):
kwargs["browsers"] = browsers

selenium_test(**kwargs)

native.java_binary(
java_binary(
name = name + "_debug_server",
main_class = "org.openqa.selenium.environment.webserver.NettyAppServer",
data = data,
Expand Down
4 changes: 4 additions & 0 deletions rb/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ gem 'activesupport', '~> 7.0', require: false, platforms: %i[mri mingw x64_mingw
gem 'curb', '~> 1.0.5', require: false, platforms: %i[mri mingw x64_mingw]
gem 'debug', '~> 1.7', require: false, platforms: %i[mri mingw x64_mingw]
gem 'steep', '~> 1.10.0', require: false, platforms: %i[mri mingw x64_mingw]

# Pin Psych to 5.0.1 because it ships with Ruby 3.2.9 https://stdgems.org/3.2.9/
# This needs to be updated whenever we upgrade to the new version of Ruby
gem 'psych', '5.0.1'
9 changes: 3 additions & 6 deletions rb/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ GEM
rexml
csv (3.3.5)
curb (1.0.9)
date (3.5.1)
date (3.5.1-java)
debug (1.11.1)
irb (~> 1.10)
reline (>= 0.3.8)
Expand Down Expand Up @@ -83,11 +81,9 @@ GEM
prettyprint
prettyprint (0.2.0)
prism (1.8.0)
psych (5.3.1)
date
psych (5.0.1)
stringio
psych (5.3.1-java)
date
psych (5.0.1-java)
jar-dependencies (>= 0.1.7)
public_suffix (7.0.2)
racc (1.8.1)
Expand Down Expand Up @@ -205,6 +201,7 @@ DEPENDENCIES
curb (~> 1.0.5)
debug (~> 1.7)
git (~> 1.19)
psych (= 5.0.1)
rack (~> 2.0)
rake (~> 13.0)
rspec (~> 3.0)
Expand Down
1 change: 1 addition & 0 deletions scripts/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@py_dev_requirements//:requirements.bzl", "requirement")
load("@rules_java//java:java_binary.bzl", "java_binary")
load("@rules_python//python:defs.bzl", "py_binary")
load("//java:defs.bzl", "artifact")

Expand Down