merge trunk

Author: RenderMichael

.bazelignore

@@ -23,5 +23,5 @@ java/build/production
 java/client/build
 java/server/build
 javascript/grid-ui/node_modules
-javascript/node/selenium-webdriver/node_modules
+javascript/selenium-webdriver/node_modules
 node_modules

.bazelrc

@@ -105,6 +105,7 @@ test --test_env=JRUBY_OPTS="--dev"
 
 test:windows --test_env=PATH
 test:windows --test_env=LOCALAPPDATA
+test:windows --test_env=PROCESSOR_ARCHITECTURE
 test:windows --test_env=PROGRAMFILES="C:\\Program Files"
 test:windows --test_env=PROGRAMFILES(X86)="C:\\Program Files (x86)"
 
@@ -118,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=-skip-remote,-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

.github/label-commenter-config.yml

@@ -15,7 +15,7 @@ labels:
                 Triage this issue by using labels.
               </p>
               <p>
-                If information is missing, add a helpful comment and then <code>I-issue-template</code> label.
+                If information is missing, add a helpful comment and then <code>J-issue-template</code> label.
               </p>
               <p>
                 If the issue is a question, add the <code>I-question</code> label.
@@ -101,18 +101,18 @@ labels:
 
           Feel free to comment the issues that you raise back in this issue. Thank you.
         action: close
-  - name: I-issue-template
+  - name: J-issue-template
     labeled:
       issue:
         body: |
           Hi, @{{ issue.user.login }}.
-          Please follow the issue template, we need more information to reproduce the issue.
+          Please follow the issue template; we need more information to reproduce the issue.
 
           Either a complete code snippet and URL/HTML (if more than one file is needed, provide a GitHub repo and instructions to run the code), the specific versions used, or a more detailed description to help us understand the issue.
 
           Note: If you cannot share your code and URL/HTML, any complete code snippet and URL/HTML that reproduces the issue is good enough.
 
-          Reply to this issue when all information is provided, thank you.
+          Reply to this issue when all information is provided. Thank you.
   - name: I-question
     labeled:
       issue:

.github/workflows/bazel.yml

@@ -70,7 +70,7 @@ on:
 jobs:
   bazel:
     name: ${{ inputs.name }}
-    runs-on: ${{ format('{0}-latest', inputs.os) }}
+    runs-on: ${{ contains(inputs.os, '-') && inputs.os || format('{0}-latest', inputs.os) }}
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       SEL_M2_USER: ${{ secrets.SEL_M2_USER }}
@@ -122,7 +122,7 @@ jobs:
           node-version: ${{ inputs.node-version }}
       - name: Setup Bazel with caching
         if: inputs.caching
-        uses: bazel-contrib/setup-bazel@0.9.1
+        uses: bazel-contrib/setup-bazel@0.13.0
         with:
           bazelisk-cache: true
           bazelrc: common --color=yes
@@ -132,13 +132,16 @@ jobs:
             name: ${{ inputs.cache-key }}
             manifest:
               crates: rust/Cargo.Bazel.lock
-              rules_ruby~~ruby~ruby: ${{ inputs.os == 'windows' && 'false' || 'rb/.ruby-version' }}
+              rules_ruby++ruby+ruby: ${{ inputs.os == 'windows' && 'false' || 'rb/.ruby-version' }}
           repository-cache: true
       - name: Setup Bazel without caching
         if: inputs.caching == false
-        uses: bazel-contrib/setup-bazel@0.9.1
+        uses: bazel-contrib/setup-bazel@0.13.0
         with:
           bazelrc: common --color=yes
+      - name: Setup curl for Ubuntu
+        if: inputs.os == 'ubuntu'
+        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Setup Fluxbox and Xvfb
         if: inputs.os == 'ubuntu' && inputs.browser != ''
         run: |
@@ -152,9 +155,6 @@ jobs:
       - name: Setup Safari
         if: inputs.browser == 'safari'
         run: sudo safaridriver --enable
-      - name: Setup curl for Ubuntu
-        if: inputs.os == 'ubuntu'
-        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Run Bazel
         run: ${{ inputs.run }}
       - name: Start SSH session

.github/workflows/ci-rbe.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       name: Check format script run
       caching: false
-      ruby-version: jruby-9.4.9.0
+      ruby-version: jruby-9.4.12.0
       run: ./scripts/github-actions/check-format.sh
 
   test:
@@ -25,5 +25,5 @@ jobs:
     with:
       name: All RBE tests
       caching: false
-      ruby-version: jruby-9.4.9.0
+      ruby-version: jruby-9.4.12.0
       run: ./scripts/github-actions/ci-build.sh

.github/workflows/ci-renovate-rbe.yml

@@ -47,7 +47,7 @@ jobs:
     with:
       name: Check format script run
       caching: false
-      ruby-version: jruby-9.4.9.0
+      ruby-version: jruby-9.4.12.0
       run: ./scripts/github-actions/check-format.sh
 
   test:
@@ -58,7 +58,7 @@ jobs:
     with:
       name: All RBE tests
       caching: false
-      ruby-version: jruby-9.4.9.0
+      ruby-version: jruby-9.4.12.0
       run: ./scripts/github-actions/ci-build.sh
 
   ci-gh:

.github/workflows/ci-ruby.yml

@@ -47,17 +47,18 @@ jobs:
             os: macos
           - ruby-version: 3.3.5
             os: ubuntu
-          - ruby-version: jruby-9.4.9.0
+          - ruby-version: jruby-9.4.12.0
             os: ubuntu
           - ruby-version: truffleruby-24.1.1
             os: ubuntu
     with:
       name: Unit Tests (${{ matrix.ruby-version }}, ${{ matrix.os }})
-      cache-key: rb-unit-test-${{ matrix.ruby-version }}
+      cache-key: rb-unit-test-${{ matrix.ruby-version }}-${{ matrix.os }}
       os: ${{ matrix.os }}
       ruby-version: ${{ matrix.ruby-version }}
       run: >
         bazel test
+        --keep_going
         --build_tests_only
         --test_size_filters small
         //rb/spec/...
@@ -82,10 +83,11 @@ jobs:
     with:
       name: Local Tests (${{ matrix.browser }}, ${{ matrix.os }})
       browser: ${{ matrix.browser }}
-      cache-key: rb-${{ matrix.browser }}-test
+      cache-key: rb-${{ matrix.browser }}-${{ matrix.os }}-test
       os: ${{ matrix.os }}
       run: >
         bazel test
+        --keep_going
         --build_tests_only
         --flaky_test_attempts 3
         --local_test_jobs 1
@@ -107,11 +109,12 @@ jobs:
     with:
       name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
       browser: ${{ matrix.browser }}
-      cache-key: rb-remote-${{ matrix.browser }}-test
+      cache-key: rb-remote-${{ matrix.browser }}-${{ matrix.os }}-test
       os: ${{ matrix.os }}
-      java-version: 11
+      java-version: 17
       run: >
         bazel test
+        --keep_going
         --build_tests_only
         --flaky_test_attempts 3
         --local_test_jobs 1

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
   check:
     name: Check
     if: >
-      github.repository_owner == 'seleniumhq' && 
+      github.repository_owner == 'seleniumhq' &&
         (startsWith(github.head_ref, 'renovate/') != true || github.event_name == 'workflow_call')
     runs-on: ubuntu-latest
     outputs:
@@ -25,7 +25,7 @@ jobs:
         with:
           fetch-depth: 50
       - name: Setup Bazel
-        uses: bazel-contrib/setup-bazel@0.9.1
+        uses: bazel-contrib/setup-bazel@0.13.0
         with:
           bazelisk-cache: true
           cache-version: 2

.github/workflows/nightly.yml

@@ -174,8 +174,8 @@ jobs:
       cache-key: javascript-nightly
       node-version: '22.x'
       run: |
-        sed -i 's|https://registry.npmjs.org/|https://npm.pkg.github.com|g' javascript/node/selenium-webdriver/package.json
-        sed -i 's|"name": "selenium-webdriver"|"name": "@seleniumhq/selenium-webdriver"|g' javascript/node/selenium-webdriver/package.json
+        sed -i 's|https://registry.npmjs.org/|https://npm.pkg.github.com|g' javascript/selenium-webdriver/package.json
+        sed -i 's|"name": "selenium-webdriver"|"name": "@seleniumhq/selenium-webdriver"|g' javascript/selenium-webdriver/package.json
         echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc
         echo "@seleniumhq:registry=https://npm.pkg.github.com" >> ~/.npmrc
         echo "always-auth=true" >> ~/.npmrc