Merge branch 'trunk' into close-http-client

Author: diemol

.bazelrc

@@ -120,6 +120,7 @@ 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
+test --test_env=SE_AVOID_STATS=true
 
 # Make sure we sniff credentials properly
 build:remote --credential_helper=%workspace%/scripts/credential-helper.sh

.github/label-commenter-config.yml

@@ -129,3 +129,11 @@ labels:
           This issue is looking for contributors.
 
           Please comment below or reach out to us through our [IRC/Slack/Matrix channels](https://www.selenium.dev/support/) if you are interested.
+  - name: I-logging
+    labeled:
+      issue:
+        body: |
+          We need more information about this issue in order to troubleshoot.
+
+          Please turn on logging and re-run your code. Information on how to adjust logs for your language can be found in our
+          [Troubleshooting documentation](https://www.selenium.dev/documentation/webdriver/troubleshooting/logging/).

.github/workflows/bazel.yml

@@ -55,6 +55,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       SEL_M2_USER: ${{ secrets.SEL_M2_USER }}
       SEL_M2_PASS: ${{ secrets.SEL_M2_PASS }}
+      SE_AVOID_STATS: true
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
@@ -70,10 +71,10 @@ jobs:
       - name: Remove driver directories Non-Windows
         if: inputs.os != 'windows'
         run: |
-          sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
+          sudo rm -rf "$CHROMEWEBDRIVER" "$EDGEWEBDRIVER" "$GECKOWEBDRIVER"
       - name: Set Ruby version
         if: inputs.ruby-version != ''
-        run: echo 'RUBY_VERSION = "${{ inputs.ruby-version }}"' > rb/ruby_version.bzl
+        run: echo '${{ inputs.ruby-version }}' > rb/.ruby-version
       - name: Setup Java
         if: inputs.java-version != ''
         uses: actions/setup-java@v3
@@ -84,6 +85,7 @@ jobs:
         uses: p0deje/[email protected]
         with:
           bazelisk-cache: true
+          bazelrc: common --color=yes
           disk-cache: ${{ inputs.cache-key }}
           external-cache: |
             name: ${{ inputs.cache-key }}
@@ -99,7 +101,7 @@ jobs:
           sudo apt-get -y install fluxbox
           Xvfb :99 &
           fluxbox -display :99 &
-          echo "DISPLAY=:99" >> $GITHUB_ENV
+          echo "DISPLAY=:99" >> "$GITHUB_ENV"
       - name: Set resolution
         if: inputs.os == 'windows' && inputs.browser != ''
         run: Set-DisplayResolution -Width 1920 -Height 1080 -Force

.github/workflows/build-selenium-manager.yml

@@ -12,6 +12,8 @@ jobs:
   win32:
     name: "[Windows x32] Build selenium-manager"
     runs-on: windows-latest
+    env:
+      RUSTFLAGS: '-Ctarget-feature=+crt-static'
     steps:
       - name: "Checkout project"
         uses: actions/checkout@v4
@@ -95,6 +97,8 @@ jobs:
   macos64:
     name: "[macOS x64/arm64] Build selenium-manager"
     runs-on: macos-latest
+    env:
+      RUSTFLAGS: '-Ctarget-feature=+crt-static'
     steps:
       - name: "Checkout project"
         uses: actions/checkout@v4

.github/workflows/ci-ruby.yml

@@ -43,13 +43,13 @@ jobs:
             os: ubuntu
           - ruby-version: 3.0.6
             os: windows
-          - ruby-version: 3.2.0
-            os: ubuntu
-          - ruby-version: 3.2.0
+          - ruby-version: 3.0.6
             os: macos
-          - ruby-version: jruby-9.4.3.0
+          - ruby-version: 3.2.2
+            os: ubuntu
+          - ruby-version: jruby-9.4.5.0
             os: ubuntu
-          - ruby-version: truffleruby-22.3.0
+          - ruby-version: truffleruby-23.1.1
             os: ubuntu
     with:
       name: Unit Tests (${{ matrix.ruby-version }}, ${{ matrix.os }})

.github/workflows/lock.yml

@@ -14,12 +14,12 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v5
         with:
           process-only: 'issues'
-          issue-lock-inactive-days: '30'
+          issue-inactive-days: '30'
           issue-lock-reason: ''
-          issue-lock-comment: >
+          issue-comment: >
             This issue has been automatically locked since there
             has not been any recent activity after it was closed.
             Please open a new issue for related bugs.

.gitignore

@@ -99,7 +99,6 @@ ipch/
 geckodriver.log
 ghostdriver.log
 .tags
-.ruby-version
 GPATH
 GRTAGS
 GSYMS

README.md

@@ -260,9 +260,10 @@ Supported environment variables:
 - `EDGE_BINARY` - path to test specific Edge browser
 - `FIREFOX_BINARY` - path to test specific Firefox browser
 
-To run with a specific version of Ruby you can change the version in `rb/ruby_version.bzl` or from command line:
+To run with a specific version of Ruby you can change the version in `rb/.ruby-version` or from command line:
+
 ```sh
-echo 'RUBY_VERSION = "<X.Y.Z>"' > rb/ruby_version.bzl
+echo '<X.Y.Z>' > rb/.ruby-version
 ```
 
 If you want to debug code in tests, you can do it via [`debug`](https://github.com/ruby/debug) gem:

Rakefile

@@ -50,12 +50,22 @@ $DEBUG = true if ENV['debug'] == 'true'
 
 verbose($DEBUG)
 
-def release_version
-  '4.16'
+def java_version
+  File.foreach('java/version.bzl') do |line|
+    return line.split('=').last.strip.tr('"', '') if line.include?('SE_VERSION')
+  end
 end
 
-def version
-  "#{release_version}.0-SNAPSHOT"
+def dotnet_version
+  File.foreach('dotnet/selenium-dotnet-version.bzl') do |line|
+    return line.split('=').last.strip.tr('"', '') if line.include?('SE_VERSION')
+  end
+end
+
+def python_version
+  File.foreach('py/BUILD.bazel') do |line|
+    return line.split('=').last.strip.tr('"', '') if line.include?('SE_VERSION')
+  end
 end
 
 # The build system used by webdriver is layered on top of rake, and we call it
@@ -99,7 +109,7 @@ JAVA_RELEASE_TARGETS = %w[
   //java/src/org/openqa/selenium/chrome:chrome.publish
   //java/src/org/openqa/selenium/chromium:chromium.publish
   //java/src/org/openqa/selenium/devtools/v119:v119.publish
-  //java/src/org/openqa/selenium/devtools/v117:v117.publish
+  //java/src/org/openqa/selenium/devtools/v120:v120.publish
   //java/src/org/openqa/selenium/devtools/v118:v118.publish
   //java/src/org/openqa/selenium/devtools/v85:v85.publish
   //java/src/org/openqa/selenium/edge:edge.publish
@@ -129,7 +139,7 @@ task all: [
   :"selenium-java",
   '//java/test/org/openqa/selenium/environment:webserver'
 ]
-task all_zip: [:'prep-release-zip']
+task all_zip: [:'java-release-zip', :'dotnet-release-zip']
 task tests: [
   '//java/test/org/openqa/selenium/htmlunit:htmlunit',
   '//java/test/org/openqa/selenium/firefox:test-synthesized',
@@ -326,30 +336,48 @@ task ios_driver: [
   '//javascript/webdriver/atoms/fragments:get_location_in_view:ios'
 ]
 
-task 'prep-release-zip': [
+task 'dotnet-release-zip': [
+  '//dotnet:all'
+] do
+  [
+      "build/dist/selenium-dotnet-#{dotnet_version}.zip",
+      "build/dist/selenium-dotnet-strongnamed-#{dotnet_version}.zip",
+  ].each do |f|
+    rm_f(f) if File.exists?(f)
+  end
+    mkdir_p 'build/dist'
+    File.delete
+
+    cp "bazel-bin/dotnet/release.zip", "build/dist/selenium-dotnet-#{dotnet_version}.zip", preserve: false
+    chmod 0666, "build/dist/selenium-dotnet-#{dotnet_version}.zip"
+    cp "bazel-bin/dotnet/strongnamed.zip", "build/dist/selenium-dotnet-strongnamed-#{dotnet_version}.zip", preserve: false
+    chmod 0666, "build/dist/selenium-dotnet-strongnamed-#{dotnet_version}.zip"
+end
+
+task 'java-release-zip': [
   '//java/src/org/openqa/selenium:client-zip',
   '//java/src/org/openqa/selenium/grid:server-zip',
   '//java/src/org/openqa/selenium/grid:executable-grid',
 ] do
   [
-    "build/dist/selenium-server-#{version}.zip",
-    "build/dist/selenium-java-#{version}.zip",
-    "build/dist/selenium-server-#{version}.jar"
+    "build/dist/selenium-server-#{java_version}.zip",
+    "build/dist/selenium-java-#{java_version}.zip",
+    "build/dist/selenium-server-#{java_version}.jar"
   ].each do |f|
     rm_f(f) if File.exists?(f)
   end
 
   mkdir_p 'build/dist'
   File.delete
-  cp "bazel-bin/java/src/org/openqa/selenium/grid/server-zip.zip", "build/dist/selenium-server-#{version}.zip", preserve: false
-  chmod 0666, "build/dist/selenium-server-#{version}.zip"
-  cp "bazel-bin/java/src/org/openqa/selenium/client-zip.zip", "build/dist/selenium-java-#{version}.zip", preserve: false
-  chmod 0666, "build/dist/selenium-java-#{version}.zip"
-  cp "bazel-bin/java/src/org/openqa/selenium/grid/selenium", "build/dist/selenium-server-#{version}.jar", preserve: false
-  chmod 0666, "build/dist/selenium-server-#{version}.jar"
+  cp "bazel-bin/java/src/org/openqa/selenium/grid/server-zip.zip", "build/dist/selenium-server-#{java_version}.zip", preserve: false
+  chmod 0666, "build/dist/selenium-server-#{java_version}.zip"
+  cp "bazel-bin/java/src/org/openqa/selenium/client-zip.zip", "build/dist/selenium-java-#{java_version}.zip", preserve: false
+  chmod 0666, "build/dist/selenium-java-#{java_version}.zip"
+  cp "bazel-bin/java/src/org/openqa/selenium/grid/selenium", "build/dist/selenium-server-#{java_version}.jar", preserve: false
+  chmod 0777, "build/dist/selenium-server-#{java_version}.jar"
 end
 
-task 'release-java': %i[prep-release-zip publish-maven]
+task 'release-java': %i[java-release-zip publish-maven]
 
 def read_m2_user_pass
   # First check env vars, then the settings.xml config inside .m2
@@ -378,6 +406,48 @@ def read_m2_user_pass
   return [user, pass]
 end
 
+task :prepare_release do
+    RELEASE_TARGETS = [
+        '//java/src/org/openqa/selenium:client-zip',
+        '//java/src/org/openqa/selenium/grid:server-zip',
+        '//java/src/org/openqa/selenium/grid:executable-grid',
+        '//dotnet/src/webdriver:webdriver-pack',
+        '//dotnet/src/webdriver:webdriver-strongnamed-pack',
+        '//dotnet/src/support:support-pack',
+        '//dotnet/src/support:support-strongnamed-pack',
+        '//javascript/node/selenium-webdriver:selenium-webdriver',
+        '//py:selenium-wheel',
+        '//py:selenium-sdist',
+    ]
+
+    RELEASE_TARGETS.each do |target|
+        Bazel::execute('build', ['--config', 'release'], target)
+    end
+    Bazel::execute('build', ['--stamp'], '//rb:selenium-webdriver')
+end
+
+PYPI_ASSETS = [
+    "bazel-bin/py/selenium-#{python_version}-py3-none-any.whl",
+    "bazel-bin/py/selenium-#{python_version}.tar.gz"
+]
+
+task 'publish-pypi' do
+    PYPI_ASSETS.each do |asset|
+        sh "python3 -m twine upload #{asset}"
+    end
+end
+
+NUGET_RELEASE_ASSETS = [
+  "./bazel-bin/dotnet/src/webdriver/Selenium.WebDriver.#{dotnet_version}.nupkg",
+  "./bazel-bin/dotnet/src/support/Selenium.Support.#{dotnet_version}.nupkg"
+]
+
+task 'publish-nuget': '//dotnet:all' do
+  NUGET_RELEASE_ASSETS.each do |asset|
+    sh "dotnet nuget push #{asset} --api-key #{ENV['NUGET_API_KEY']} --source https://api.nuget.org/v3/index.json"
+  end
+end
+
 task 'publish-maven': JAVA_RELEASE_TARGETS do
   creds = read_m2_user_pass
   JAVA_RELEASE_TARGETS.each do |p|
@@ -387,7 +457,7 @@ end
 
 task 'publish-maven-snapshot': JAVA_RELEASE_TARGETS do
   creds = read_m2_user_pass
-  if version.end_with?('-SNAPSHOT')
+  if java_version.end_with?('-SNAPSHOT')
     JAVA_RELEASE_TARGETS.each do |p|
       Bazel::execute('run', ['--stamp', '--define', 'maven_repo=https://oss.sonatype.org/content/repositories/snapshots', '--define', "maven_user=#{creds[0]}", '--define', "maven_password=#{creds[1]}", '--define', 'gpg_sign=false'], p)
     end

WORKSPACE

@@ -327,19 +327,18 @@ pin_browsers()
 
 http_archive(
     name = "rules_ruby",
-    sha256 = "92055f29f94963cd3cf7be1da15503c3306879e2e8545b2b5f9e5bb37d6713d3",
-    strip_prefix = "rules_ruby-0.2.0",
-    url = "https://github.com/p0deje/rules_ruby/releases/download/v0.2.0/rules_ruby-v0.2.0.tar.gz",
+    sha256 = "e3495d0129222572654cc5dd5c72c6c997513d65fb8649f43a860ab15334a1c2",
+    strip_prefix = "rules_ruby-0.4.1",
+    url = "https://github.com/bazel-contrib/rules_ruby/releases/download/v0.4.1/rules_ruby-v0.4.1.tar.gz",
 )
 
 load(
     "@rules_ruby//ruby:deps.bzl",
     "rb_bundle",
     "rb_register_toolchains",
 )
-load("//rb:ruby_version.bzl", "RUBY_VERSION")
 
-rb_register_toolchains(version = RUBY_VERSION)
+rb_register_toolchains(version_file = "//:rb/.ruby-version")
 
 rb_bundle(
     name = "bundle",