Merge branch 'trunk' into close-bidi-socket-connection

SeleniumHQ · Sep 23, 2024 · 243c068 · 243c068
2 parents 878dbab + 01ed12f
commit 243c068
Show file tree

Hide file tree

Showing 65 changed files with 836 additions and 435 deletions.
diff --git a/.github/workflows/pre-release.yml b/.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 "selenium-ci@users.noreply.github.com"

diff --git a/.github/workflows/stage-release.yml b/.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 "selenium-ci@users.noreply.github.com"
           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

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
@@ -199,34 +201,35 @@ jobs:
           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
+        uses: actions/download-artifact@v4
         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
+        uses: actions/download-artifact@v4
         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
+        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
+        uses: actions/download-artifact@v4
         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
+        uses: actions/download-artifact@v4
         with:
           name: node-docs-patch
           path: patches/
+          merge-multiple: true
       - name: Apply patches
         run: |
           for patch in patches/*.patch; do

diff --git a/.gitignore b/.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

diff --git a/AUTHORS b/AUTHORS
@@ -23,7 +23,6 @@ Ahmed Ashour <asashour@yahoo.com>
 AJ <anandj82@gmail.com>
 Ajay Kemparaj <ajaykemparaj@gmail.com>
 Akhil Lb <akhil.lb1@gmail.com>
-Ákos Lukács <AkosLukacs42@gmail.com>
 Akuli <akuviljanen17@gmail.com>
 Al Sutton <alsutton@users.noreply.github.com>
 Alan Baird <alan.baird@livingsocial.com>
@@ -137,7 +136,6 @@ Carlos Ortega <roh.race@gmail.com>
 Carlos Villela
 Carson McDonald <carson@ioncannon.net>
 ce86f3bb9faf71e <118820152+ce86f3bb9faf71e@users.noreply.github.com>
-Cédric Boutillier <cedric.boutillier@gmail.com>
 Cervac Petru <petru.cervac@gmail.com>
 cezarelnazli <cezarelnazli@users.noreply.github.com>
 ch-saeki <31008335+ch-saeki@users.noreply.github.com>
@@ -174,6 +172,7 @@ Coty Rosenblath <coty@pobox.com>
 Craig Nishina <craig.nishina@gmail.com>
 CsolG <csolg7@gmail.com>
 customcommander <hello@spinjs.com>
+Cédric Boutillier <cedric.boutillier@gmail.com>
 Dakkaron <dak1st@gmx.at>
 Damien Allison <dakkad@users.noreply.github.com>
 Damir <damirz@gmail.com>
@@ -232,6 +231,7 @@ Dmitry Tokarev <dmitrytokarev@users.noreply.github.com>
 Dmytro Shpakovskyi <Marketionist@users.noreply.github.com>
 dnknitro <vova64@gmail.com>
 doctor-house <66467615+doctor-house@users.noreply.github.com>
+Dominic Evans <8060970+dnwe@users.noreply.github.com>
 Dominik Dary <ddary@ebay.com>
 Dominik Rauch <dominik.rauch@rubicon.eu>
 Dominik Stadler <dominik.stadler@gmx.at>
@@ -267,7 +267,6 @@ Eric Plaster <eric.plaster@mutualmobile.com>
 Erik Beans <ebeans@google.com>
 Erik E. Beerepoot <erikbeerepoot@hush.com>
 Erik Kuefler <ekuefler@gmail.com>
-Étienne Barrié <etienne.barrie@gmail.com>
 Evan Sangaline <esangaline@gmail.com>
 Evgeniy Roldukhin <evgeniy@roldukhin.ru>
 EwaMarek <ewa.marek.3.14@gmail.com>
@@ -279,10 +278,10 @@ Florian LOPES <florian.lopes@outlook.com>
 Florian Mutter <32459530+florianmutter@users.noreply.github.com>
 Florian Zipperle <zipperle@users.noreply.github.com>
 Francis Bergin <bergin.francis@gmail.com>
+Franz Liedke <franz@develophp.org>
 François Freitag <francois.freitag@polyconseil.fr>
 François JACQUES <hypnoce@donarproject.org>
 François Reynaud <francois.reynaud@gmail.com>
-Franz Liedke <franz@develophp.org>
 Frederik Carlier <frederik.carlier@quamotion.mobi>
 Fredrik Wollsén <fredrik@neam.se>
 freynaud <francois.reynaud@gmail.com>
@@ -425,7 +424,6 @@ Jim van Musscher <jim.van.musscher@gmail.com>
 jkbzh <3439365+jkbzh@users.noreply.github.com>
 jkohls <johnny@appthwack.com>
 jmuramatsu <jmuramatsu@gmail.com>
-João Luca Ripardo <jlucartc@gmail.com>
 Joaquín Romero <joromerom@gmail.com>
 jochenberger <fooberger@gmail.com>
 Joe Bandenburg <joe@bandenburg.com>
@@ -457,12 +455,12 @@ Jonathan Lipps <jlipps@gmail.com>
 Jonathon Kereliuk <kereliuk.j@gmail.com>
 Jongkuen Hong <dldkfod@naver.com>
 Jordan Mace <jordan.mace@inlogik.com>
-Jörg Sautter <joerg.sautter@gmx.net>
 josephg <josephg@gmail.com>
 Josh Goldberg <joshuakgoldberg@outlook.com>
 Joshua Bruning <joshbruning@gmail.com>
 Joshua Fehler <jsfehler@users.noreply.github.com>
 Joshua Grant <joshua.m.grant@gmail.com>
+João Luca Ripardo <jlucartc@gmail.com>
 JT Archie <jarchie@pivotal.io>
 jugglinmike <mike@mikepennisi.com>
 Julian Didier <did.julian@gmail.com>
@@ -477,6 +475,7 @@ Justin Tulloss <justin.tulloss@gmail.com>
 Justine Tunney <jtunney@gmail.com>
 justinwoolley@gmail.com <jwoolley@netflix.com>
 jwoolley <19597672+jwoolley@users.noreply.github.com>
+Jörg Sautter <joerg.sautter@gmx.net>
 Kamen Litchev <kamenlitchev@users.noreply.github.com>
 Karl Kuehn <kuehn.karl@gmail.com>
 Karl-Philipp Richter <krichter722@aol.de>
@@ -530,10 +529,10 @@ Lucas Diniz <kbelodiniz@hotmail.com>
 Lucas Tierney <lucastierney@gmail.com>
 Luis Correia <luis.f.correia@gmail.com>
 Luis Pflamminger <luis.pflamminger@gmail.com>
-Lukáš Linhart <lukas.linhart.1981@gmail.com>
 Luke Hill <lukehill_uk@hotmail.com>
 Luke Inman-Semerau <luke.semerau@gmail.com>
 lukec <lukec@example.com>
+Lukáš Linhart <lukas.linhart.1981@gmail.com>
 Lyudmil Latinov <llatinov@users.noreply.github.com>
 Machinexa2 <60662297+machinexa2@users.noreply.github.com>
 Maciej Pakulski <pakulski.maciej@gmail.com>
@@ -809,15 +808,16 @@ Stuart Knightly <stuidge@gmail.com>
 sufyanAbbasi <sufyanAbbasi@users.noreply.github.com>
 sugama <sugama@jamadam.com>
 sunnyyukaige <kaige8531917@163.com>
+Swastik Baranwal <swstkbaranwal@gmail.com>
 symonk <jackofspaces@gmail.com>
 Take <takewakamma@gmail.com>
 take0x <89313929+take0x@users.noreply.github.com>
 Takeshi Kishi <takeya0x86@gmail.com>
 Takuho NAKANO <takotakot@users.noreply.github.com>
 Takuma Chiba <hogenoserver@gmail.com>
-Tamás Buka <buka86@gmail.com>
 Tamas Utasi <3823780+utamas@users.noreply.github.com>
 Tamsil Sajid Amani <tamsajama@gmail.com>
+Tamás Buka <buka86@gmail.com>
 Tatsuya Hoshino <tatsuya7.hoshino7@gmail.com>
 Terence Haddock
 thecr8tr <thecr8tr@users.noreply.github.com>
@@ -860,7 +860,6 @@ Ulf Adams <ulfjack@users.noreply.github.com>
 Ulrich Buchgraber <ulrich.b@gmx.at>
 User253489 <user253489@gmail.com>
 V24 <55334829+umarfarouk98@users.noreply.github.com>
-Václav Votípka <enca@enca.cz>
 Valery Yatsynovich <valfirst@yandex.ru>
 Varun Menon <mr.varun.menon@gmail.com>
 varunsurapaneni <67070327+varunsurapaneni@users.noreply.github.com>
@@ -885,6 +884,7 @@ Vladimir Támara Patiño <vtamara@pasosdeJesus.org>
 VladimirPodolyan <36446855+VladimirPodolyan@users.noreply.github.com>
 Vladislav Velichko <111522705+vlad8x8@users.noreply.github.com>
 Vyvyan Codd
+Václav Votípka <enca@enca.cz>
 Werner Robitza <slhck@users.noreply.github.com>
 wiggin15 <wiggin15@yahoo.com>
 wildloop <mariusz@olejnik.net>
@@ -906,4 +906,6 @@ Zhuo Peng <zhuo.peng@vanemy.org>
 Ziyu <odduid@gmail.com>
 Zoltar - Knower of All
 zsong <zsong@example.com>
+Ákos Lukács <AkosLukacs42@gmail.com>
+Étienne Barrié <etienne.barrie@gmail.com>
 保木本将之 <markun@markun.local>