Merge branch 'trunk' into rbe_eif

Author: aguspe

.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

@@ -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=-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/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

.github/workflows/stage-release.yml

@@ -19,11 +19,13 @@ jobs:
       (github.event.pull_request.merged == true &&
       github.repository_owner == 'seleniumhq' &&
       startsWith(github.event.pull_request.head.ref, 'release-preparation-')) ||
-      (github.event_name == 'workflow_dispatch' && 
-      github.event.inputs.version != '' && 
+      (github.event_name == 'workflow_dispatch' &&
+      github.event.inputs.version != '' &&
       github.repository_owner == 'seleniumhq')
     runs-on: ubuntu-latest
     permissions: write-all
+    outputs:
+      version: ${{ env.VERSION }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -41,10 +43,6 @@ jobs:
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
-      #      - name: Tag Release
-      #        run: |
-      #          git tag selenium-${{ env.VERSION }} || echo "Tag already exists"
-      #          git push origin selenium-${{ env.VERSION }} || echo "Tag already exists remotely"
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
@@ -71,4 +69,5 @@ jobs:
     needs: github-release
     uses: ./.github/workflows/update-documentation.yml
     with:
-      tag: selenium-${{ needs.github-release.outputs.version }}
+      version: ${{ needs.github-release.outputs.version }}
+      sha: ${{ github.sha }}

.github/workflows/update-documentation.yml

@@ -87,7 +87,7 @@ jobs:
         if: ${{ matrix.language == 'node' }}
         run: |
           npm install
-          npm install --prefix javascript/node/selenium-webdriver
+          npm install --prefix javascript/selenium-webdriver
       - name: Update Documentation
         run: ./go ${{ matrix.language }}:docs
       - name: Documentation Pull Request

.gitignore

@@ -19,11 +19,11 @@ dotnet/packages/
 java/client/src/org/openqa/selenium/ie/IeReturnTypes.java
 java/server/test/org/openqa/selenium/example
 javascript/deps.js
-javascript/node/selenium-webdriver/node_modules/
-javascript/node/selenium-webdriver/lib/atoms/find-elements.js
-javascript/node/selenium-webdriver/lib/atoms/get-attribute.js
-javascript/node/selenium-webdriver/lib/atoms/is-displayed.js
-javascript/node/selenium-webdriver/lib/atoms/mutation-listener.js
+javascript/selenium-webdriver/node_modules/
+javascript/selenium-webdriver/lib/atoms/find-elements.js
+javascript/selenium-webdriver/lib/atoms/get-attribute.js
+javascript/selenium-webdriver/lib/atoms/is-displayed.js
+javascript/selenium-webdriver/lib/atoms/mutation-listener.js
 javascript/safari-driver/node_modules/
 javascript/webdriver/devtools/types/
 .idea/vcs.xml
@@ -137,7 +137,7 @@ MODULE.bazel.lock
 # Engflow
 *.crt
 *.key
-javascript/node/selenium-webdriver/.vscode/settings.json
+javascript/selenium-webdriver/.vscode/settings.json
 
 dotnet-bin
 .metadata/

.skipped-tests

@@ -19,14 +19,14 @@
 -//javascript/atoms:test-edge
 -//javascript/atoms:test-firefox-beta
 -//javascript/chrome-driver/...
--//javascript/node/selenium-webdriver:test-bidi-network-test.js-chrome
--//javascript/node/selenium-webdriver:test-builder-test.js-chrome
--//javascript/node/selenium-webdriver:test-builder-test.js-firefox
--//javascript/node/selenium-webdriver:test-chrome-devtools-test.js-chrome
--//javascript/node/selenium-webdriver:test-chrome-options-test.js-chrome
--//javascript/node/selenium-webdriver:test-chrome-service-test.js-chrome
--//javascript/node/selenium-webdriver:test-firefox-options-test.js-firefox
--//javascript/node/selenium-webdriver:test-lib-capabilities-test.js-chrome
+-//javascript/selenium-webdriver:test-bidi-network-test.js-chrome
+-//javascript/selenium-webdriver:test-builder-test.js-chrome
+-//javascript/selenium-webdriver:test-builder-test.js-firefox
+-//javascript/selenium-webdriver:test-chrome-devtools-test.js-chrome
+-//javascript/selenium-webdriver:test-chrome-options-test.js-chrome
+-//javascript/selenium-webdriver:test-chrome-service-test.js-chrome
+-//javascript/selenium-webdriver:test-firefox-options-test.js-firefox
+-//javascript/selenium-webdriver:test-lib-capabilities-test.js-chrome
 -//py:test-chrome-test/selenium/webdriver/chrome/chrome_launcher_tests.py
 -//py:test-chrome-test/selenium/webdriver/chrome/chrome_service_tests.py
 -//py:test-chrome-test/selenium/webdriver/chrome/proxy_tests.py

BUILD.bazel

@@ -72,7 +72,7 @@ java_binary(
 
 npm_link_package(
     name = "node_modules/selenium-webdriver",
-    src = "//javascript/node/selenium-webdriver",
+    src = "//javascript/selenium-webdriver",
 )
 
 platform(

CONTRIBUTING.md

@@ -109,7 +109,7 @@ installed on your local machine, or by executing:
 
 ```shell
 # Example of adding a dep to the JS webdriver bindings 
-cd javascript/node/selenium-webdriver
+cd javascript/selenium-webdriver
 bazel run javascript:pnpm -- install my-amazing-dep --dir $PWD
 ```
 
@@ -255,12 +255,12 @@ Build your code for the latest changes and run tests locally.
 
   Node Tests
   ```shell
-  % bazel test //javascript/node/selenium-webdriver:tests
+  % bazel test //javascript/selenium-webdriver:all
   ```
 
   Firefox Atom Tests
   ```shell
-  % bazel test --test_tag_filters=firefox //javascript/atoms/... //javascript/selenium-atoms/... //javascript/webdriver/...
+  % bazel test --test_tag_filters=firefox //javascript/atoms/... //javascript/webdriver/...
   ```
 
   Grid UI Unit Tests
@@ -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