Merge branch 'trunk' into refactor

Author: sandeepsuryaprasad

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -49,7 +49,7 @@ body:
     id: selenium-version
     attributes:
       label: What version of Selenium are you currently using?
-      description: Important! The latest released version of Selenium is 4.30 and we can't fix old versions.
+      description: Important! The latest released version of Selenium is 4.31 and we can't fix old versions.
       placeholder: e.g., 4.17.0
     validations:
       required: true

.github/label-commenter-config.yml

@@ -6,36 +6,7 @@ labels:
         body: |
           @{{ issue.user.login }}, thank you for creating this issue. We will troubleshoot it as soon as we can.
 
-          ---
-          <details>
-            <summary>Info for maintainers</summary>
-            <div>
-              <br>
-              <p>
-                Triage this issue by using labels.
-              </p>
-              <p>
-                If information is missing, add a helpful comment and then <code>J-issue-template</code> label.
-              </p>
-              <p>
-                If the issue is a question, add the <code>I-question</code> label.
-              </p>
-              <p>
-                If the issue is valid but there is no time to troubleshoot it, consider adding the <code>help wanted</code> label.
-              </p>
-              <p>
-                If the issue requires changes or fixes from an external project (e.g., ChromeDriver, GeckoDriver, MSEdgeDriver, W3C),
-               add the applicable <code>G-*</code> label, and it will provide the correct link and auto-close the
-               issue.
-              </p>
-              <p>
-                After troubleshooting the issue, please add the <code>R-awaiting answer</code> label.
-              </p>
-              <p>
-                Thank you!
-              </p>
-            </div>
-          </details>
+          Selenium Triage Team: remember to follow the [Triage Guide](https://github.com/SeleniumHQ/selenium/blob/trunk/README.md)
   - name: G-w3c
     labeled:
       issue:
@@ -122,14 +93,14 @@ labels:
           * 📮 [StackOverflow](https://stackoverflow.com/questions/tagged/selenium)
           * 🗣 Our [IRC/Slack/Matrix channels](https://www.selenium.dev/support/) where the community can help you as well
         action: close
-  - name: help wanted
+  - name: R-help wanted
     labeled:
       issue:
         body: |
           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
+  - name: J-logging
     labeled:
       issue:
         body: |

.github/workflows/issue-labeler.yml

@@ -181,3 +181,8 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           labels: J-awaiting answer
+      - name: Remove label
+        if: steps.version-check.outputs.is-outdated == 'true'
+        uses: actions-ecosystem/action-remove-labels@v1
+        with:
+          labels: A-needs-triaging

.github/workflows/label-commenter.yml

@@ -24,7 +24,5 @@ jobs:
       - name: Label Commenter
         uses: peaceiris/actions-label-commenter@v1
         with:
-          # The individual PAT is needed so commenter can auto-executes on PRs from Forks
-          # It expires 4/1/2026
-          github_token: ${{ secrets.PR_LABELER_PAT }}
+          github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
           config_file: .github/label-commenter-config.yml

.github/workflows/nightly.yml

@@ -21,10 +21,16 @@ on:
           - grid
           - dotnet
           - javascript
+  workflow_call:
+    inputs:
+      language:
+        required: false
+        type: string
+        default: "all"
 
 jobs:
   ruby:
-    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'ruby' || github.event_name == 'schedule')
+    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'ruby' || inputs.language == 'all' || github.event_name == 'schedule')
     name: Ruby
     uses: ./.github/workflows/bazel.yml
     strategy:
@@ -57,7 +63,7 @@ jobs:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
 
   python:
-    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'python' || github.event_name == 'schedule')
+    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'python' || inputs.language == 'all' || github.event_name == 'schedule')
     name: Python
     uses: ./.github/workflows/bazel.yml
     with:
@@ -84,7 +90,7 @@ jobs:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
 
   java:
-    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'java' || github.event_name == 'schedule')
+    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'java' || inputs.language == 'all' || github.event_name == 'schedule')
     name: Java
     uses: ./.github/workflows/bazel.yml
     with:
@@ -111,7 +117,7 @@ jobs:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
 
   dotnet:
-    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'dotnet' || github.event_name == 'schedule')
+    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'dotnet' || inputs.language == 'all' || github.event_name == 'schedule')
     name: DotNet
     uses: ./.github/workflows/bazel.yml
     with:
@@ -139,7 +145,7 @@ jobs:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
 
   grid:
-    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'grid' || github.event_name == 'schedule')
+    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'grid' || inputs.language == 'all' || github.event_name == 'schedule')
     name: Grid
     uses: ./.github/workflows/bazel.yml
     with:
@@ -166,7 +172,7 @@ jobs:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
 
   javascript:
-    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'javascript' || github.event_name == 'schedule')
+    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'javascript' || inputs.language == 'all' || github.event_name == 'schedule')
     name: JavaScript
     uses: ./.github/workflows/bazel.yml
     with:

.github/workflows/pr-labeler.yml

@@ -21,7 +21,5 @@ jobs:
       - name: Auto label Pull Requests
         uses: actions/labeler@v5
         with:
-          # The individual PAT is needed so labeler auto-executes this workflow
-          # It expires 4/1/2026
-          repo-token: ${{ secrets.PR_LABELER_PAT }}
+          repo-token: ${{ secrets.SELENIUM_CI_TOKEN }}
           configuration-path: .github/pr-labeler-config.yml

.github/workflows/pre-release.yml

@@ -25,24 +25,23 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0
-          fetch-tags: true
       - name: "Prep git"
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
-          if git rev-parse --verify release-${{ github.event.inputs.version }} >/dev/null 2>&1; then
-          git branch -D release-${{ github.event.inputs.version }}
+          if git rev-parse --verify rust-release-${{ github.event.inputs.version }} >/dev/null 2>&1; then
+            git branch -D rust-release-${{ github.event.inputs.version }}
           fi
-          git checkout -b release-${{ github.event.inputs.version }}
+          git checkout -b rust-release-${{ github.event.inputs.version }}
       - name: Update Rust Version
-        run: |
-          ./go rust:version[${{ github.event.inputs.version }}]
-          ./go rust:version:commit
+        run: ./go rust:version ${{ github.event.inputs.version }}
+      - name: Commit Rust updates
+        run: git commit -m "update selenium manager version and rust changelog"
       - name: Push changes
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
-          branch: release-${{ github.event.inputs.version }}
+          branch: rust-release-${{ github.event.inputs.version }}
           force: true
 
   selenium-manager:
@@ -51,10 +50,23 @@ jobs:
     uses: ./.github/workflows/ci-rust.yml
     with:
       release: true
-      branch: release-${{ github.event.inputs.version }}
+      branch: rust-release-${{ github.event.inputs.version }}
     secrets:
       SELENIUM_CI_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
 
+  cleanup-rust-branch:
+    name: Cleanup Rust Branch
+    needs: selenium-manager
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout repo"
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.SELENIUM_CI_TOKEN }}
+      - name: "Delete rust release branch"
+        run: |
+          git push origin --delete rust-release-${{ github.event.inputs.version }}
+
   update-files:
     name: Update Files
     runs-on: ubuntu-latest
@@ -79,11 +91,11 @@ jobs:
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
       - name: Update browser versions
-        run: ./go update_browsers[${{ github.event.inputs.chrome_channel }}]
+        run: ./go update_browsers ${{ github.event.inputs.chrome_channel }}
       - name: Commit browser updates
         run: git commit -m "update pinned browser versions"
       - name: Update devtools versions
-        run: ./go all:update_cdp[${{ github.event.inputs.chrome_channel }}]
+        run: ./go all:update_cdp ${{ github.event.inputs.chrome_channel }}
       - name: Commit DevTools updates
         run: git commit -m "update devtools versions"
       - name: Update Selenium Manager versions
@@ -99,7 +111,7 @@ jobs:
       - name: Commit Authors updates
         run: git commit -m "update authors file"
       - name: Bump minor version
-        run: ./go all:version
+        run: ./go all:version ${{ github.event.inputs.version }}
       - name: Commit version updates
         run: git commit -m "bump versions in preparation for release"
       - name: Update changelog

.github/workflows/stage-release.yml

@@ -11,7 +11,6 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
 
 jobs:
   github-release:
@@ -29,10 +28,13 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Extract version from branch name
         if: github.event.pull_request.merged == true
         run: |
-          VERSION=$(echo $BRANCH_NAME | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
+          TEMP_BRANCH_NAME=${{ github.event.pull_request.head.ref }}
+          VERSION=$(echo $TEMP_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'
@@ -50,6 +52,14 @@ jobs:
           distribution: 'temurin'
       - name: Setup curl for Ubuntu
         run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
+      - name: Delete nightly tag
+        run: |
+          if git rev-parse --verify refs/tags/nightly >/dev/null 2>&1; then
+            echo "Deleting nightly tag"
+            git push origin --delete refs/tags/nightly
+          else
+            echo "No nightly tag found - nothing to delete"
+          fi
       - name: Build and Stage Packages
         run: ./go all:package[--config=release]
       - name: Generate Draft Release

.github/workflows/update-docs-after-action.yml

@@ -0,0 +1,30 @@
+name: Update Version After Docs Merge
+
+on:
+  pull_request:
+    types: [ closed ]
+    branches:
+      - gh-pages
+    paths:
+      - 'docs/api/**'
+
+jobs:
+  parse-pr-title:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'Update documentation for Selenium')
+    outputs:
+      language: ${{ steps.extract-language.outputs.language }}
+    steps:
+      - name: Extract language from PR title
+        id: extract-language
+        run: |
+          PR_TITLE="${{ github.event.pull_request.title }}"
+          LANGUAGE=$(echo "$PR_TITLE" | grep -o '[^-]*$')
+          echo "language=$LANGUAGE" >> $GITHUB_OUTPUT
+  update-version:
+    needs: parse-pr-title
+    uses: ./.github/workflows/nightly.yml
+    with:
+      language: ${{ needs.parse-pr-title.outputs.language }}
+    secrets: inherit
+

.github/workflows/update-documentation.yml

@@ -37,24 +37,8 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  determine-languages:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - id: set-matrix
-        run: |
-          if [ "${{ inputs.language }}" == "all" ]; then
-            echo 'matrix={"language":["java","rb","py","dotnet","node"]}' >> $GITHUB_OUTPUT
-          else
-            echo 'matrix={"language":["${{ inputs.language }}"]}' >> $GITHUB_OUTPUT
-          fi
   build-docs:
-    needs: determine-languages
     runs-on: ubuntu-latest
-    strategy:
-      matrix: ${{ fromJson(needs.determine-languages.outputs.matrix) }}
-      fail-fast: false
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -69,43 +53,49 @@ jobs:
       - name: Setup curl for Ubuntu
         run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Setup Java
+        if: ${{ inputs.language == 'java' || inputs.language == 'all' }}
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
       - name: Set up Python 3.9
-        if: ${{ matrix.language == 'py' }}
+        if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
         uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Install dependencies
-        if: ${{ matrix.language == 'py' }}
+        if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
         run: |
           python -m pip install --upgrade pip
           pip install tox
       - name: Install npm dependencies
-        if: ${{ matrix.language == 'node' }}
+        if: ${{ inputs.language == 'node' || inputs.language == 'all' }}
         run: |
           npm install
           npm install --prefix javascript/selenium-webdriver
-      - name: Update Documentation
-        run: ./go ${{ matrix.language }}:docs
+      - name: Generate Documentation for selected langauges
+        run: ./go ${{ inputs.language }}:docs
       - name: Documentation Pull Request
+        id: cpr
         uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.SELENIUM_CI_TOKEN }}
           author: Selenium CI Bot <[email protected]>
           delete-branch: true
-          branch: api-docs-${{ inputs.version }}-${{ matrix.language }}
+          branch: api-docs-${{ inputs.version }}
           base: gh-pages
-          add-paths: |
-            ${{ matrix.language == 'node' && 'docs/api/javascript/**' || format('docs/api/{0}/**', matrix.language) }}
-          title: Update documentation for Selenium ${{ inputs.version }} (${{ matrix.language }})
+          add-paths: docs/api/**
+          title: Update documentation for Selenium ${{ inputs.version }}-${{ inputs.language }}
           body: |
-            This PR updates the API documentation for **${{ matrix.language }}** language bindings to version **${{ inputs.version }}**.
+            This PR updates the API documentation for version **${{ inputs.version }}-${{ inputs.language }}**.
 
-            - Auto-generated by [create-pull-request][1]
-
-            [1]: https://github.com/peter-evans/create-pull-request
+            - Auto-generated by [workflow run #${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
           labels: B-docs
           draft: false
+      - name: Enable Pull Request Auto-merge
+        if: steps.cpr.outputs.pull-request-operation == 'created'
+        uses: peter-evans/enable-pull-request-automerge@v3
+        with:
+          token: ${{ secrets.SELENIUM_CI_TOKEN }}
+          pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
+          merge-method: squash