Merge branch 'trunk' into syber911911-feature-branch

Author: syber911911

.github/workflows/pre-release.yml

@@ -72,6 +72,8 @@ jobs:
         with:
           ruby-version: '3.1'
           working-directory: 'rb'
+      - name: Setup curl for Ubuntu
+        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: "Prep git"
         run: |
           git config --local user.email "[email protected]"

.github/workflows/stage-release.yml

@@ -2,7 +2,12 @@ name: Release Staging
 
 on:
   pull_request:
-    types: [closed]
+    types: [ closed ]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Selenium version to release'
+        required: true
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -11,52 +16,56 @@ env:
 jobs:
   github-release:
     if: >
-      github.event.pull_request.merged == true &&
+      (github.event.pull_request.merged == true &&
       github.repository_owner == 'seleniumhq' &&
-      startsWith(github.event.pull_request.head.ref, 'release-preparation-')
+      startsWith(github.event.pull_request.head.ref, 'release-preparation-')) ||
+      (github.event_name == 'workflow_dispatch' && 
+      github.event.inputs.version != '' && 
+      github.repository_owner == 'seleniumhq')
     runs-on: ubuntu-latest
+    permissions: write-all
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
       - name: Extract version from branch name
-        id: extract_version
+        if: github.event.pull_request.merged == true
         run: |
           VERSION=$(echo $BRANCH_NAME | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
           echo "VERSION=$VERSION" >> $GITHUB_ENV
+      - name: Extract version from workflow input
+        if: github.event_name == 'workflow_dispatch'
+        run: |
+          VERSION=${{ inputs.version }}
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
       - name: Prep git
         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 }}
-          git push origin selenium-${{ env.VERSION }}
-      - 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: 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:
           java-version: 17
           distribution: 'temurin'
+      - name: Setup curl for Ubuntu
+        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: Generate Draft Release
-        uses: softprops/action-gh-release@v2
+        uses: ncipollo/release-action@v1
         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 }}
+          artifacts: "build/dist/*.*"
+          bodyFile: "scripts/github-actions/release_header.md"
           draft: true
-          generate_release_notes: true
+          generateReleaseNotes: true
+          name: "Selenium ${{ env.VERSION }}"
           prerelease: false
-          files: build/dist/*.*
+          skipIfReleaseExists: true
+          tag: "selenium-${{ env.VERSION }}"
+          commit: "${{ github.sha }}"
 
   update-documentation:
     needs: github-release

.github/workflows/update-documentation.yml

@@ -46,7 +46,7 @@ jobs:
           git config --local user.email "[email protected]"
           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 "[email protected]"
           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 "[email protected]"
           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 "[email protected]"
           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

.gitignore

@@ -78,6 +78,7 @@ py/docs/source/**/*
 py/build/
 py/LICENSE
 py/pytestdebug.log
+py/python.iml
 selenium.egg-info/
 third_party/java/jetty/jetty-repacked.jar
 *.user
@@ -140,3 +141,4 @@ javascript/node/selenium-webdriver/.vscode/settings.json
 
 dotnet-bin
 .metadata/
+.npmrc

AUTHORS

@@ -23,7 +23,6 @@ Ahmed Ashour <[email protected]>
 AJ <[email protected]>
 Ajay Kemparaj <[email protected]>
 Akhil Lb <[email protected]>
-Ákos Lukács <[email protected]>
 Akuli <[email protected]>
 Al Sutton <[email protected]>
 Alan Baird <[email protected]>
@@ -137,7 +136,6 @@ Carlos Ortega <[email protected]>
 Carlos Villela
 Carson McDonald <[email protected]>
 ce86f3bb9faf71e <[email protected]>
-Cédric Boutillier <[email protected]>
 Cervac Petru <[email protected]>
 cezarelnazli <[email protected]>
 ch-saeki <[email protected]>
@@ -174,6 +172,7 @@ Coty Rosenblath <[email protected]>
 Craig Nishina <[email protected]>
 CsolG <[email protected]>
 customcommander <[email protected]>
+Cédric Boutillier <[email protected]>
 Dakkaron <[email protected]>
 Damien Allison <[email protected]>
 Damir <[email protected]>
@@ -232,6 +231,7 @@ Dmitry Tokarev <[email protected]>
 Dmytro Shpakovskyi <[email protected]>
 dnknitro <[email protected]>
 doctor-house <[email protected]>
+Dominic Evans <[email protected]>
 Dominik Dary <[email protected]>
 Dominik Rauch <[email protected]>
 Dominik Stadler <[email protected]>
@@ -267,7 +267,6 @@ Eric Plaster <[email protected]>
 Erik Beans <[email protected]>
 Erik E. Beerepoot <[email protected]>
 Erik Kuefler <[email protected]>
-Étienne Barrié <[email protected]>
 Evan Sangaline <[email protected]>
 Evgeniy Roldukhin <[email protected]>
 EwaMarek <[email protected]>
@@ -279,10 +278,10 @@ Florian LOPES <[email protected]>
 Florian Mutter <[email protected]>
 Florian Zipperle <[email protected]>
 Francis Bergin <[email protected]>
+Franz Liedke <[email protected]>
 François Freitag <[email protected]>
 François JACQUES <[email protected]>
 François Reynaud <[email protected]>
-Franz Liedke <[email protected]>
 Frederik Carlier <[email protected]>
 Fredrik Wollsén <[email protected]>
 freynaud <[email protected]>
@@ -425,7 +424,6 @@ Jim van Musscher <[email protected]>
 jkbzh <[email protected]>
 jkohls <[email protected]>
 jmuramatsu <[email protected]>
-João Luca Ripardo <[email protected]>
 Joaquín Romero <[email protected]>
 jochenberger <[email protected]>
 Joe Bandenburg <[email protected]>
@@ -457,12 +455,12 @@ Jonathan Lipps <[email protected]>
 Jonathon Kereliuk <[email protected]>
 Jongkuen Hong <[email protected]>
 Jordan Mace <[email protected]>
-Jörg Sautter <[email protected]>
 josephg <[email protected]>
 Josh Goldberg <[email protected]>
 Joshua Bruning <[email protected]>
 Joshua Fehler <[email protected]>
 Joshua Grant <[email protected]>
+João Luca Ripardo <[email protected]>
 JT Archie <[email protected]>
 jugglinmike <[email protected]>
 Julian Didier <[email protected]>
@@ -477,6 +475,7 @@ Justin Tulloss <[email protected]>
 Justine Tunney <[email protected]>
 [email protected] <[email protected]>
 jwoolley <[email protected]>
+Jörg Sautter <[email protected]>
 Kamen Litchev <[email protected]>
 Karl Kuehn <[email protected]>
 Karl-Philipp Richter <[email protected]>
@@ -530,10 +529,10 @@ Lucas Diniz <[email protected]>
 Lucas Tierney <[email protected]>
 Luis Correia <[email protected]>
 Luis Pflamminger <[email protected]>
-Lukáš Linhart <[email protected]>
 Luke Hill <[email protected]>
 Luke Inman-Semerau <[email protected]>
 lukec <[email protected]>
+Lukáš Linhart <[email protected]>
 Lyudmil Latinov <[email protected]>
 Machinexa2 <[email protected]>
 Maciej Pakulski <[email protected]>
@@ -809,15 +808,16 @@ Stuart Knightly <[email protected]>
 sufyanAbbasi <[email protected]>
 sugama <[email protected]>
 sunnyyukaige <[email protected]>
+Swastik Baranwal <[email protected]>
 symonk <[email protected]>
 Take <[email protected]>
 take0x <[email protected]>
 Takeshi Kishi <[email protected]>
 Takuho NAKANO <[email protected]>
 Takuma Chiba <[email protected]>
-Tamás Buka <[email protected]>
 Tamas Utasi <[email protected]>
 Tamsil Sajid Amani <[email protected]>
+Tamás Buka <[email protected]>
 Tatsuya Hoshino <[email protected]>
 Terence Haddock
 thecr8tr <[email protected]>
@@ -860,7 +860,6 @@ Ulf Adams <[email protected]>
 Ulrich Buchgraber <[email protected]>
 User253489 <[email protected]>
 V24 <[email protected]>
-Václav Votípka <[email protected]>
 Valery Yatsynovich <[email protected]>
 Varun Menon <[email protected]>
 varunsurapaneni <[email protected]>
@@ -885,6 +884,7 @@ Vladimir Támara Patiño <[email protected]>
 VladimirPodolyan <[email protected]>
 Vladislav Velichko <[email protected]>
 Vyvyan Codd
+Václav Votípka <[email protected]>
 Werner Robitza <[email protected]>
 wiggin15 <[email protected]>
 wildloop <[email protected]>
@@ -906,4 +906,6 @@ Zhuo Peng <[email protected]>
 Ziyu <[email protected]>
 Zoltar - Knower of All
 zsong <[email protected]>
+Ákos Lukács <[email protected]>
+Étienne Barrié <[email protected]>
 保木本将之 <[email protected]>