Merge branch 'trunk' into sm_check_browser_version

SeleniumHQ · Sep 26, 2024 · 5583c4b · 5583c4b
2 parents db8f912 + 419484d
commit 5583c4b
Show file tree

Hide file tree

Showing 18 changed files with 64 additions and 99 deletions.
diff --git a/.github/workflows/stage-release.yml b/.github/workflows/stage-release.yml
@@ -23,6 +23,7 @@ jobs:
       github.event.inputs.version != '' && 
       github.repository_owner == 'seleniumhq')
     runs-on: ubuntu-latest
+    permissions: write-all
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -53,37 +54,18 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Build and Stage Packages
         run: ./go all:package[--config=release]
-      #      - name: Update Nightly Tag to Remove pre-release
-      #        run: |
-      #          git fetch --tags
-      #          git tag -d nightly || echo "Nightly tag not found"
-      #          git tag nightly
-      #          git push origin refs/tags/nightly --force
       - name: Generate Draft Release
         uses: ncipollo/release-action@v1
         with:
           artifacts: "build/dist/*.*"
           bodyFile: "scripts/github-actions/release_header.md"
           draft: true
           generateReleaseNotes: true
-          name: Selenium ${{ env.VERSION }}
+          name: "Selenium ${{ env.VERSION }}"
           prerelease: false
           skipIfReleaseExists: true
-          tag: selenium-${{ env.VERSION }}
-          commit: trunk
-  #      - name: Generate Draft Release
-  #        uses: softprops/action-gh-release@v2
-  #        with:
-  #          name: Selenium ${{ env.VERSION }}
-  #          body: |
-  #            ## Detailed Changelogs by Component
-  #            <img src="https://www.selenium.dev/images/programming/java.svg" width="20" height="20"> **[Java](https://github.com/SeleniumHQ/selenium/blob/trunk/java/CHANGELOG)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/python.svg" width="20" height="20"> **[Python](https://github.com/SeleniumHQ/selenium/blob/trunk/py/CHANGES)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/csharp.svg" width="20" height="20"> **[DotNet](https://github.com/SeleniumHQ/selenium/blob/trunk/dotnet/CHANGELOG)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/ruby.svg" width="20" height="20"> **[Ruby](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/javascript.svg" width="20" height="20"> **[JavaScript](https://github.com/SeleniumHQ/selenium/blob/trunk/javascript/node/selenium-webdriver/CHANGES.md)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/browsers/internet-explorer.svg" width="20" height="20"> **[IEDriver](https://github.com/SeleniumHQ/selenium/blob/trunk/cpp/iedriverserver/CHANGELOG)**
-  #            <br>
-  #          tag_name: selenium-${{ env.VERSION }}
-  #          draft: true
-  #          generate_release_notes: true
-  #          prerelease: false
-  #          files: build/dist/*.*
+          tag: "selenium-${{ env.VERSION }}"
+          commit: "${{ github.sha }}"
 
   update-documentation:
     needs: github-release

diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
@@ -46,7 +46,7 @@ jobs:
           git config --local user.email "selenium-ci@users.noreply.github.com"
           git config --local user.name "Selenium CI Bot"
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
@@ -58,7 +58,7 @@ jobs:
           git format-patch -1 HEAD --stdout > java-docs.patch
       - name: Upload patch
         if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'java'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: java-docs-patch
           path: java-docs.patch
@@ -76,10 +76,12 @@ jobs:
           git config --local user.email "selenium-ci@users.noreply.github.com"
           git config --local user.name "Selenium CI Bot"
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
+      - name: Setup curl for Ubuntu
+        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Update Documentation
         if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'ruby'
         run: ./go rb:docs
@@ -88,7 +90,7 @@ jobs:
           git format-patch -1 HEAD --stdout > ruby-docs.patch
       - name: Upload patch
         if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'ruby'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ruby-docs-patch
           path: ruby-docs.patch
@@ -106,7 +108,7 @@ jobs:
           git config --local user.email "selenium-ci@users.noreply.github.com"
           git config --local user.name "Selenium CI Bot"
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
       - name: Install dependencies
@@ -121,7 +123,7 @@ jobs:
           git format-patch -1 HEAD --stdout > python-docs.patch
       - name: Upload patch
         if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'python'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: python-docs-patch
           path: python-docs.patch
@@ -150,7 +152,7 @@ jobs:
           git format-patch -1 HEAD --stdout > dotnet-docs.patch
       - name: Upload patch
         if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'dotnet'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: dotnet-docs-patch
           path: dotnet-docs.patch
@@ -179,7 +181,7 @@ jobs:
           git format-patch -1 HEAD --stdout > node-docs.patch
       - name: Upload patch
         if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'node'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: node-docs-patch
           path: node-docs.patch
@@ -192,46 +194,26 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: 'gh-pages'
+          fetch-depth: 0
+          fetch-tags: true
       - name: Create and checkout new branch
         run: |
           git config --local user.email "selenium-ci@users.noreply.github.com"
           git config --local user.name "Selenium CI Bot"
           git checkout -b api-docs-${{ inputs.tag }}
-      - name: Download Java patch
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'java'
-        uses: actions/download-artifact@v2
-        with:
-          name: java-docs-patch
-          path: patches/
-      - name: Download Ruby patch
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'ruby'
-        uses: actions/download-artifact@v2
-        with:
-          name: ruby-docs-patch
-          path: patches/
-      - name: Download Python patch
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'python'
-        uses: actions/download-artifact@v2
+      - name: Download all patches
+        uses: actions/download-artifact@v4
         with:
-          name: python-docs-patch
-          path: patches/
-      - name: Download .NET patch
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'dotnet'
-        uses: actions/download-artifact@v2
-        with:
-          name: dotnet-docs-patch
-          path: patches/
-      - name: Download Node patch
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'node'
-        uses: actions/download-artifact@v2
-        with:
-          name: node-docs-patch
           path: patches/
+          merge-multiple: true
+      - name: Show downloaded patches
+        run: ls -lah patches/
       - name: Apply patches
         run: |
           for patch in patches/*.patch; do
             git am < "$patch"
           done
+          rm -rf patches/
       - name: Push Branch
         run: git push origin api-docs-${{ inputs.tag }}
       - name: Documentation Pull Request

diff --git a/common/mirror/selenium b/common/mirror/selenium
@@ -3,13 +3,33 @@
     "tag_name": "nightly",
     "assets": [
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.25.0.zip"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.26.0-SNAPSHOT.zip"
       },
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.25.0.jar"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.26.0-SNAPSHOT.jar"
       },
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.25.0.zip"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.26.0-SNAPSHOT.zip"
+      }
+    ]
+  },
+  {
+    "tag_name": "selenium-4.25.0",
+    "assets": [
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.25.0/selenium-dotnet-4.25.0.zip"
+      },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.25.0/selenium-dotnet-strongnamed-4.25.0.zip"
+      },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.25.0/selenium-java-4.25.0.zip"
+      },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.25.0/selenium-server-4.25.0.jar"
+      },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.25.0/selenium-server-4.25.0.zip"
       }
     ]
   },
@@ -938,25 +958,5 @@
         "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-rc-1/selenium-server-4.0.0-rc-1.zip"
       }
     ]
-  },
-  {
-    "tag_name": "selenium-4.0.0-beta-4",
-    "assets": [
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-beta-4/selenium-dotnet-4.0.0-beta-4.zip"
-      },
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-beta-4/selenium-dotnet-strongnamed-4.0.0-beta-4.zip"
-      },
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-beta-4/selenium-html-runner-4.0.0-beta-4.jar"
-      },
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-beta-4/selenium-java-4.0.0-beta-4.zip"
-      },
-      {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.0.0-beta-4/selenium-server-4.0.0-beta-4.jar"
-      }
-    ]
   }
 ]
diff --git a/dotnet/selenium-dotnet-version.bzl b/dotnet/selenium-dotnet-version.bzl
@@ -1,6 +1,6 @@
 # BUILD FILE SYNTAX: STARLARK
 
-SE_VERSION = "4.25.0"
+SE_VERSION = "4.26.0-nightly202409202352"
 ASSEMBLY_VERSION = "4.0.0.0"
 SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0"]
 

diff --git a/dotnet/src/webdriver/DevTools/DevToolsSession.cs b/dotnet/src/webdriver/DevTools/DevToolsSession.cs
@@ -301,7 +301,7 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
                         LogTrace("Recieved Error Response {0}: {1} {2}", modified.CommandId, message, errorData);
                         throw new CommandResponseException(exceptionMessage)
                         {
-                            Code = modified.Result["code"].GetValue<long>()
+                            Code = modified.Result["code"]?.GetValue<long>() ?? -1
                         };
                     }
 

diff --git a/dotnet/src/webdriver/WebDriver.csproj b/dotnet/src/webdriver/WebDriver.csproj
@@ -71,15 +71,15 @@
   </ItemGroup>
 
   <Target Name="GenerateSeleniumManagerBinaries" BeforeTargets="PrepareForBuild">
-    <Exec Command="bazel build //dotnet/src/webdriver:manager-linux //dotnet/src/webdriver:manager-windows //dotnet/src/webdriver:manager-macos" />
+    <Exec Command="bazel build //dotnet/src/webdriver:manager-linux //dotnet/src/webdriver:manager-windows //dotnet/src/webdriver:manager-macos" WorkingDirectory="../../.." />
 
     <PropertyGroup>
       <BaseSeleniumManagerPath>..\..\..\bazel-bin\dotnet\src\webdriver\manager</BaseSeleniumManagerPath>
     </PropertyGroup>
   </Target>
 
   <Target Name="GenerateAtoms" BeforeTargets="PrepareForBuild">
-    <Exec Command="bazel build //javascript/webdriver/atoms:get-attribute.js //javascript/atoms/fragments:is-displayed.js //javascript/atoms/fragments:find-elements.js" />
+    <Exec Command="bazel build //javascript/webdriver/atoms:get-attribute.js //javascript/atoms/fragments:is-displayed.js //javascript/atoms/fragments:find-elements.js" WorkingDirectory="../../.." />
 
     <ItemGroup>
       <EmbeddedResource Include="$(ProjectDir)..\..\..\third_party\js\selenium\webdriver.json">
@@ -106,7 +106,7 @@
   </Target>
 
   <Target Name="GenerateCdp" BeforeTargets="CoreCompile">
-    <Exec Command="bazel build //dotnet/src/webdriver/cdp:generate-v85 //dotnet/src/webdriver/cdp:generate-v127 //dotnet/src/webdriver/cdp:generate-v128 //dotnet/src/webdriver/cdp:generate-v129" />
+    <Exec Command="bazel build //dotnet/src/webdriver/cdp:generate-v85 //dotnet/src/webdriver/cdp:generate-v127 //dotnet/src/webdriver/cdp:generate-v128 //dotnet/src/webdriver/cdp:generate-v129" WorkingDirectory="../../.." />
 
     <ItemGroup>
       <Compile Include="..\..\..\bazel-bin\dotnet\src\webdriver\cdp\**\*.cs" LinkBase="DevTools\generated" />

diff --git a/dotnet/test/common/WebDriver.Common.Tests.csproj b/dotnet/test/common/WebDriver.Common.Tests.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <Target Name="BuildTestWebServer" AfterTargets="AfterBuild">
-    <Exec Command="bazel build //java/test/org/openqa/selenium/environment:appserver_deploy.jar" />
+    <Exec Command="bazel build //java/test/org/openqa/selenium/environment:appserver_deploy.jar" WorkingDirectory="../../.." />
   </Target>
 
   <!-- It is automatically imported when Selenium.WebDriver consumed via nuget package -->

diff --git a/java/version.bzl b/java/version.bzl
@@ -1,2 +1,2 @@
-SE_VERSION = "4.25.0"
+SE_VERSION = "4.26.0-SNAPSHOT"
 TOOLS_JAVA_VERSION = "17"
diff --git a/javascript/node/selenium-webdriver/BUILD.bazel b/javascript/node/selenium-webdriver/BUILD.bazel
@@ -11,7 +11,7 @@ load("//javascript/private:browsers.bzl", "BROWSERS")
 
 npm_link_all_packages(name = "node_modules")
 
-VERSION = "4.25.0"
+VERSION = "4.26.0-nightly202409202352"
 
 BROWSER_VERSIONS = [
     "v85",
@@ -63,6 +63,7 @@ npm_package(
         "//javascript/node/selenium-webdriver/lib/atoms:mutation-listener",
     ],
     package = "selenium-webdriver",
+    publishable = True,
     tags = [
         "release-artifact",
     ],

diff --git a/javascript/node/selenium-webdriver/package.json b/javascript/node/selenium-webdriver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "selenium-webdriver",
-  "version": "4.25.0",
+  "version": "4.26.0-nightly202409202352",
   "description": "The official WebDriver JavaScript bindings from the Selenium project",
   "license": "Apache-2.0",
   "keywords": [

diff --git a/package-lock.json b/package-lock.json
diff --git a/py/BUILD.bazel b/py/BUILD.bazel
@@ -62,7 +62,7 @@ compile_pip_requirements(
     ],
 )
 
-SE_VERSION = "4.25.0"
+SE_VERSION = "4.26.0.dev202409202351"
 
 BROWSER_VERSIONS = [
     "v85",

diff --git a/py/docs/source/conf.py b/py/docs/source/conf.py
@@ -56,9 +56,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.25'
+version = '4.26'
 # The full version, including alpha/beta/rc tags.
-release = '4.25.0'
+release = '4.26.0.dev202409202351'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/py/selenium/__init__.py b/py/selenium/__init__.py
@@ -16,4 +16,4 @@
 # under the License.
 
 
-__version__ = "4.25.0"
+__version__ = "4.26.0.dev202409202351"
diff --git a/py/selenium/webdriver/__init__.py b/py/selenium/webdriver/__init__.py
@@ -44,7 +44,7 @@
 from .wpewebkit.service import Service as WPEWebKitService  # noqa
 from .wpewebkit.webdriver import WebDriver as WPEWebKit  # noqa
 
-__version__ = "4.25.0"
+__version__ = "4.26.0.dev202409202351"
 
 # We need an explicit __all__ because the above won't otherwise be exported.
 __all__ = [

diff --git a/py/setup.py b/py/setup.py
@@ -28,7 +28,7 @@
 setup_args = {
     'cmdclass': {'install': install},
     'name': 'selenium',
-    'version': "4.25.0",
+    'version': "4.26.0.dev202409202351",
     'license': 'Apache 2.0',
     'description': 'Official Python bindings for Selenium WebDriver.',
     'long_description': open(join(abspath(dirname(__file__)), "README.rst")).read(),

diff --git a/rb/Gemfile.lock b/rb/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     selenium-devtools (0.129.0)
       selenium-webdriver (~> 4.2)
-    selenium-webdriver (4.25.0)
+    selenium-webdriver (4.26.0.nightly)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)

diff --git a/rb/lib/selenium/webdriver/version.rb b/rb/lib/selenium/webdriver/version.rb
@@ -19,6 +19,6 @@
 
 module Selenium
   module WebDriver
-    VERSION = '4.25.0'
+    VERSION = '4.26.0.nightly'
   end # WebDriver
 end # Selenium
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,7 @@ compile_pip_requirements( @@
         ],
     )
-    SE_VERSION = "4.25.0"
+    SE_VERSION = "4.26.0.dev202409202351"
     BROWSER_VERSIONS = [
         "v85",
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,4 @@
		# under the License.


		__version__ = "4.25.0"
		__version__ = "4.26.0.dev202409202351"