Merge branch 'trunk' into network

Author: pujagani

.bazelrc

@@ -119,9 +119,9 @@ build:release --stamp
 build:release --compilation_mode=opt
 
 # As regular `release` but all the build work happens on the RBE
-build:remote_release --config=release
-build:remote_release --config=remote
-build:remote_release --remote_download_toplevel
+build:rbe_release --config=release
+build:rbe_release --config=rbe
+build:rbe_release --remote_download_toplevel
 
 # RBE
 import %workspace%/.bazelrc.remote

.bazelrc.remote

@@ -1,68 +1,68 @@
 # The RBE to use
-build:remote --bes_results_url=https://gypsum.cluster.engflow.com/invocation
-build:remote --bes_backend=grpcs://gypsum.cluster.engflow.com
-build:remote --remote_executor=grpcs://gypsum.cluster.engflow.com
-build:remote --remote_cache=grpcs://gypsum.cluster.engflow.com
+build:rbe --bes_results_url=https://gypsum.cluster.engflow.com/invocation
+build:rbe --bes_backend=grpcs://gypsum.cluster.engflow.com
+build:rbe --remote_executor=grpcs://gypsum.cluster.engflow.com
+build:rbe --remote_cache=grpcs://gypsum.cluster.engflow.com
 
 # The number of cores available
-build:remote -j 50
+build:rbe -j 50
 
-build:remote --define=EXECUTOR=remote
-build:remote --experimental_inmemory_dotd_files
-build:remote --experimental_inmemory_jdeps_files
-build:remote --remote_timeout=3600
-build:remote --spawn_strategy=remote,local
-#build:remote --nolegacy_important_outputs
-build:remote --incompatible_strict_action_env=true
+build:rbe --define=EXECUTOR=remote
+build:rbe --experimental_inmemory_dotd_files
+build:rbe --experimental_inmemory_jdeps_files
+build:rbe --remote_timeout=3600
+build:rbe --spawn_strategy=remote,local
+#build:rbe --nolegacy_important_outputs
+build:rbe --incompatible_strict_action_env=true
 
-build:remote --crosstool_top=//common/remote-build/cc:toolchain
-build:remote --extra_execution_platforms=//common/remote-build:platform
-build:remote --extra_toolchains=//common/remote-build:cc-toolchain
-build:remote --host_platform=//common/remote-build:platform
-build:remote --platforms=//common/remote-build:platform
-build:remote --cxxopt=-std=c++14
+build:rbe --crosstool_top=//common/remote-build/cc:toolchain
+build:rbe --extra_execution_platforms=//common/remote-build:platform
+build:rbe --extra_toolchains=//common/remote-build:cc-toolchain
+build:rbe --host_platform=//common/remote-build:platform
+build:rbe --platforms=//common/remote-build:platform
+build:rbe --cxxopt=-std=c++14
 
 # The Docker images are running Linux
-build:remote --cpu=k8
-build:remote --host_cpu=k8
+build:rbe --cpu=k8
+build:rbe --host_cpu=k8
 
-build:remote --disk_cache=
+build:rbe --disk_cache=
 
-build:remote --incompatible_enable_cc_toolchain_resolution
-build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
-test:remote --test_env=DISPLAY=:99.0
-test:remote --test_tag_filters=-exclusive-if-local,-skip-rbe,-remote
+build:rbe --incompatible_enable_cc_toolchain_resolution
+build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+test:rbe --test_env=DISPLAY=:99.0
+test:rbe --test_tag_filters=-exclusive-if-local,-skip-rbe,-remote
 
 # Env vars we can hard code
-build:remote --action_env=HOME=/home/dev
-build:remote --action_env=PATH=/bin:/usr/bin:/usr/local/bin
-test:remote --test_env=PATH=/bin:/usr/bin:/usr/local/bin
-test:remote --test_env=HOME=/home/dev
+build:rbe --action_env=HOME=/home/dev
+build:rbe --action_env=PATH=/bin:/usr/bin:/usr/local/bin
+test:rbe --test_env=PATH=/bin:/usr/bin:/usr/local/bin
+test:rbe --test_env=HOME=/home/dev
 
 # Make sure we sniff credentials properly
-build:remote --credential_helper=gypsum.cluster.engflow.com=%workspace%/scripts/credential-helper.sh
+build:rbe --credential_helper=gypsum.cluster.engflow.com=%workspace%/scripts/credential-helper.sh
 
 # Use pinned browsers when running remotely
-build:remote --//common:pin_browsers
+build:rbe --//common:pin_browsers
 
 # The remote build machines are pretty small, and 50 threads may leave them
 # thrashing, but our dev machines are a lot larger. Scale the workload so we
 # make reasonable usage of everything, everywhere, all at once.
-build:remote --local_resources=cpu='HOST_CPUS*10'
-build:remote --local_resources=memory='HOST_RAM*4.0'
+build:rbe --local_resources=cpu='HOST_CPUS*10'
+build:rbe --local_resources=memory='HOST_RAM*4.0'
 
 # A small hint that we're running our tests remotely
-test:remote --test_env=REMOTE_BUILD=1
+test:rbe --test_env=REMOTE_BUILD=1
 
 # Wait for up to 5 minutes for a test to pass
-test:remote --test_timeout=600
+test:rbe --test_timeout=600
 
 # Extend the remote config for CI
-build:remote-ci --config=remote
-build:remote-ci --curses=no --color=yes --show_timestamps --show_progress_rate_limit=5
-build:remote-ci --bes_upload_mode=wait_for_upload_complete
-build:remote-ci --remote_download_minimal
+build:rbe-ci --config=rbe
+build:rbe-ci --curses=no --color=yes --show_timestamps --show_progress_rate_limit=5
+build:rbe-ci --bes_upload_mode=wait_for_upload_complete
+build:rbe-ci --remote_download_minimal
 
 # Configuration changes suggested by EngFlow
-build:remote --grpc_keepalive_time=30s
-build:remote --nolegacy_important_outputs
+build:rbe --grpc_keepalive_time=30s
+build:rbe --nolegacy_important_outputs

CONTRIBUTING.md

@@ -358,8 +358,8 @@ Check https://selenium.dev/support/ for a complete list of options to communicat
 
 To access the EngFlow RBE, a developer needs to be granted access to our project
 container repository. Once that has been done, then any bazel command can be run
-remotely by using `--config=remote`. For example: `bazel build --config=remote
-grid` or `bazel test --config=remote java/test/...`
+remotely by using `--config=rbe`. For example: `bazel build --config=rbe
+grid` or `bazel test --config=rbe java/test/...`
 
 When you run a remote build, one of the first lines of output from Bazel will 
 include a link to the EngFlow UI so you can track the progress of the build and

Rakefile

@@ -378,7 +378,7 @@ task ios_driver: [
 # ./go java:package['--config=release']
 desc 'Create stamped zipped assets for Java for uploading to GitHub'
 task :'java-release-zip' do
-  Rake::Task['java:package'].invoke('--config=remote_release')
+  Rake::Task['java:package'].invoke('--config=rbe_release')
 end
 
 task 'release-java': %i[java-release-zip publish-maven]
@@ -494,8 +494,8 @@ namespace :node do
   end
 
   desc 'Release Node npm package'
-  task :release, [:nightly] do |_task, arguments|
-    nightly = arguments[:nightly]
+  task :release do |_task, arguments|
+    nightly = arguments.to_a.include?('nightly')
     if nightly
       puts 'Updating Node version to nightly...'
       Rake::Task['node:version'].invoke('nightly') if nightly
@@ -565,8 +565,8 @@ namespace :py do
   end
 
   desc 'Release Python wheel and sdist to pypi'
-  task :release, [:nightly] do |_task, arguments|
-    nightly = arguments[:nightly]
+  task :release do |_task, arguments|
+    nightly = arguments.to_a.include?('nightly')
     if nightly
       puts 'Updating Python version to nightly...'
       Rake::Task['py:version'].invoke('nightly')
@@ -741,8 +741,8 @@ namespace :rb do
   end
 
   desc 'Push Ruby gems to rubygems'
-  task :release, [:nightly] do |_task, arguments|
-    nightly = arguments[:nightly]
+  task :release do |_task, arguments|
+    nightly = arguments.to_a.include?('nightly')
 
     if nightly
       puts 'Bumping Ruby nightly version...'
@@ -751,9 +751,11 @@ namespace :rb do
       puts 'Releasing nightly WebDriver gem...'
       Bazel.execute('run', ['--config=release'], '//rb:selenium-webdriver-release-nightly')
     else
+      patch_release = ruby_version.split('.').fetch(2, '0').to_i.positive?
+
       puts 'Releasing Ruby gems...'
       Bazel.execute('run', ['--config=release'], '//rb:selenium-webdriver-release')
-      Bazel.execute('run', ['--config=release'], '//rb:selenium-devtools-release')
+      Bazel.execute('run', ['--config=release'], '//rb:selenium-devtools-release') unless patch_release
     end
   end
 
@@ -823,8 +825,8 @@ namespace :dotnet do
   end
 
   desc 'Upload nupkg files to Nuget'
-  task :release, [:nightly] do |_task, arguments|
-    nightly = arguments[:nightly]
+  task :release do |_task, arguments|
+    nightly = arguments.to_a.include?('nightly')
     if nightly
       puts 'Updating .NET version to nightly...'
       Rake::Task['dotnet:version'].invoke('nightly')
@@ -941,8 +943,8 @@ namespace :java do
   end
 
   desc 'Deploy all jars to Maven'
-  task :release, [:nightly] do |_task, arguments|
-    nightly = arguments[:nightly]
+  task :release do |_task, arguments|
+    nightly = arguments.to_a.include?('nightly')
 
     ENV['MAVEN_USER'] ||= ENV.fetch('SEL_M2_USER', nil)
     ENV['MAVEN_PASSWORD'] ||= ENV.fetch('SEL_M2_PASS', nil)
@@ -1142,17 +1144,17 @@ namespace :all do
   end
 
   desc 'Release all artifacts for all language bindings'
-  task :release, [:nightly] do |_task, arguments|
+  task :release do |_task, arguments|
     Rake::Task['clean'].invoke
 
-    nightly = arguments[:nightly]
-    Rake::Task['java:release'].invoke(nightly)
-    Rake::Task['py:release'].invoke(nightly)
-    Rake::Task['rb:release'].invoke(nightly)
-    Rake::Task['dotnet:release'].invoke(nightly)
-    Rake::Task['node:release'].invoke(nightly)
+    args = arguments.to_a.include?('nightly') ? ['nightly'] : []
+    Rake::Task['java:release'].invoke(*args)
+    Rake::Task['py:release'].invoke(*args)
+    Rake::Task['rb:release'].invoke(*args)
+    Rake::Task['dotnet:release'].invoke(*args)
+    Rake::Task['node:release'].invoke(*args)
 
-    unless nightly
+    unless args.include?('nightly')
       puts 'bump all versions to nightly'
       Rake::Task['all:version'].invoke('nightly')
     end

common/mirror/selenium

@@ -3,13 +3,13 @@
     "tag_name": "nightly",
     "assets": [
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.30.0.zip"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.31.0-SNAPSHOT.zip"
       },
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.30.0.jar"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.31.0-SNAPSHOT.jar"
       },
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.30.0.zip"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.31.0-SNAPSHOT.zip"
       }
     ]
   },

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b8/linux-x86_64/en-US/firefox-137.0b8.tar.xz",
-        sha256 = "6d83ac868fab6dfc6226cff129b327a2f7dfde17fc7cc1164ab42c8637615776",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b9/linux-x86_64/en-US/firefox-137.0b9.tar.xz",
+        sha256 = "c31ca582522327d3946d33e4bb610d340e8b80b82a8d94f1397abe1a2493c4b2",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
 
     dmg_archive(
         name = "mac_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b8/mac/en-US/Firefox%20137.0b8.dmg",
-        sha256 = "1783388e740355ffaf215bf10d32ce0d4aaf65183a9eeef64bee3c0dcce2a6e2",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/137.0b9/mac/en-US/Firefox%20137.0b9.dmg",
+        sha256 = "55ac7aa4c6fff6c84cfef94850482f733a83a8f8a61167b76b3e0ef43a5f76ac",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
 
     pkg_archive(
         name = "mac_edge",
-        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/d7f65f74-be89-4936-ad8d-c6a5d8ba8efd/MicrosoftEdge-134.0.3124.77.pkg",
-        sha256 = "a768a8708129ba776ef28a1c4d86208398d2eaf898028d89f5dfde465fcdf07e",
+        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/48fbf911-c173-49ef-a3cd-44bea1f03e93/MicrosoftEdge-134.0.3124.83.pkg",
+        sha256 = "9e32af222a441f8f0858dd87191b5163e9c6fa86e73243b69eea63db04cac169",
         move = {
-            "MicrosoftEdge-134.0.3124.77.pkg/Payload/Microsoft Edge.app": "Edge.app",
+            "MicrosoftEdge-134.0.3124.83.pkg/Payload/Microsoft Edge.app": "Edge.app",
         },
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
 
     deb_archive(
         name = "linux_edge",
-        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_134.0.3124.68-1_amd64.deb",
-        sha256 = "ce337cb2c55e477cb2c3e7bab55cdcaeb6242d3a28f119a6e068dc1bd8903299",
+        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_134.0.3124.83-1_amd64.deb",
+        sha256 = "df95dffa59575a01065f1c35170305e6dca194d09c42538a7983fe4142bb5963",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
 
     http_archive(
         name = "linux_edgedriver",
-        url = "https://msedgedriver.azureedge.net/134.0.3124.68/edgedriver_linux64.zip",
-        sha256 = "ada55ec37b7b7206dfc0e208b9edd89308a26095c767a802475b933d492cb729",
+        url = "https://msedgedriver.azureedge.net/134.0.3124.83/edgedriver_linux64.zip",
+        sha256 = "e1b72b689773624f3a6ec0b08273453b2b230074224fcc1e80adc8ad04faca0b",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
 
     http_archive(
         name = "mac_edgedriver",
-        url = "https://msedgedriver.azureedge.net/134.0.3124.77/edgedriver_mac64.zip",
-        sha256 = "699918e20020e31f3a8ec186c631d31e90038ad65e793d8d4b25bbc3332cf7c1",
+        url = "https://msedgedriver.azureedge.net/134.0.3124.83/edgedriver_mac64.zip",
+        sha256 = "9839de83ae375ad5dd136827b46cfa21b486265cf87b471a7abd2dc07812f79b",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -199,8 +199,8 @@ js_library(
 
     http_archive(
         name = "linux_chrome",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.90/linux64/chrome-linux64.zip",
-        sha256 = "77cea8bb689792cd35a82d26d4025b06ce507852ea84505f5912f691c6448789",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.165/linux64/chrome-linux64.zip",
+        sha256 = "1d93094e9781d1b1deb634b4cbf21369e5fb91a374689037e7aa712445045b9d",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -221,8 +221,8 @@ js_library(
 
     http_archive(
         name = "mac_chrome",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.90/mac-x64/chrome-mac-x64.zip",
-        sha256 = "cbd2aac7add53395b7d6722999f6b63aa1eac5ca20c4255816c369ae1e34b70a",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.165/mac-x64/chrome-mac-x64.zip",
+        sha256 = "cf1a1bba1d82b790aac96b32a8647c00ba8281d194cb6c0c556beb5472e350bd",
         strip_prefix = "chrome-mac-x64",
         patch_cmds = [
             "mv 'Google Chrome for Testing.app' Chrome.app",
@@ -243,8 +243,8 @@ js_library(
 
     http_archive(
         name = "linux_chromedriver",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.90/linux64/chromedriver-linux64.zip",
-        sha256 = "00c9c9a3f55859424d4bc5f3e325e2eb59f17e0587f31db74c775a252a4b4e62",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.165/linux64/chromedriver-linux64.zip",
+        sha256 = "f45902a1b61ae4e5741c468286677213c6376fd6543b0809b94a84e6f7fc17f8",
         strip_prefix = "chromedriver-linux64",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -261,8 +261,8 @@ js_library(
 
     http_archive(
         name = "mac_chromedriver",
-        url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.90/mac-x64/chromedriver-mac-x64.zip",
-        sha256 = "6cb5a24c82e0acca8574ccff0e8c6f08d929a9bc9fd2cee47fd3af1b3e8167d4",
+        url = "https://storage.googleapis.com/chrome-for-testing-public/134.0.6998.165/mac-x64/chromedriver-mac-x64.zip",
+        sha256 = "4e5ff9ecbe1586e4820784e532b25c33eec0304f7699919d59d2888a4f49b95c",
         strip_prefix = "chromedriver-mac-x64",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")

dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs

@@ -27,8 +27,8 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(MessageError))]
 [JsonSerializable(typeof(MessageEvent))]
 
-[JsonSerializable(typeof(Modules.Script.EvaluateResult.Success))]
-[JsonSerializable(typeof(Modules.Script.EvaluateResult.Exception))]
+[JsonSerializable(typeof(Modules.Script.EvaluateResultSuccess))]
+[JsonSerializable(typeof(Modules.Script.EvaluateResultException))]
 
 [JsonSerializable(typeof(Modules.Script.NumberRemoteValue))]
 [JsonSerializable(typeof(Modules.Script.BooleanRemoteValue))]

dotnet/src/webdriver/BiDi/Communication/Json/Converters/Polymorphic/EvaluateResultConverter.cs

@@ -33,8 +33,8 @@ internal class EvaluateResultConverter : JsonConverter<EvaluateResult>
 
         return jsonDocument.RootElement.GetProperty("type").ToString() switch
         {
-            "success" => jsonDocument.Deserialize<EvaluateResult.Success>(options),
-            "exception" => jsonDocument.Deserialize<EvaluateResult.Exception>(options),
+            "success" => jsonDocument.Deserialize<EvaluateResultSuccess>(options),
+            "exception" => jsonDocument.Deserialize<EvaluateResultException>(options),
             _ => null,
         };
     }