Merge branch 'trunk' into release-preparation-4.31.0

titusfortner · web-flow · commit eb4a5563bce6 · 2025-04-04T11:24:29.000-07:00
diff --git a/.github/label-commenter-config.yml b/.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:
diff --git a/.github/workflows/label-commenter.yml b/.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
diff --git a/.github/workflows/pr-labeler.yml b/.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
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -34,8 +34,7 @@ jobs:
           fi
           git checkout -b rust-release-${{ github.event.inputs.version }}
       - name: Update Rust Version
-        run: |
-          ./go rust:version ${{ github.event.inputs.version }}
+        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
diff --git a/.github/workflows/update-docs-after-action.yml b/.github/workflows/update-docs-after-action.yml
@@ -0,0 +1,52 @@
+name: Update Version After Docs Merge
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - gh-pages
+    paths:
+      - 'docs/api/**'
+
+jobs:
+  update-version:
+    if: github.event.pull_request.merged == true && contains(github.event.pull_request.title, 'Update documentation for Selenium')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout trunk branch
+        uses: actions/checkout@v4
+        with:
+          ref: trunk
+          token: ${{ secrets.SELENIUM_CI_TOKEN }}
+
+      - name: Setup git
+        run: |
+          git config --local user.email "selenium-ci@users.noreply.github.com"
+          git config --local user.name "Selenium CI Bot"
+
+      - name: Update versions to nightly
+        run: ./go all:version nightly
+
+      - name: Bump Nightly Versions Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ secrets.SELENIUM_CI_TOKEN }}
+          author: Selenium CI Bot <selenium-ci@users.noreply.github.com>
+          delete-branch: true
+          branch: bump-nightly-version
+          title: Update to nightly versions
+          body: |
+            This PR bumps the bindings to nightly versions after merging
+            the PR updating the API documentation.
+
+            - 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
diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
@@ -40,21 +40,19 @@ jobs:
   determine-languages:
     runs-on: ubuntu-latest
     outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
+      languages: ${{ steps.set-languages.outputs.languages }}
     steps:
-      - id: set-matrix
+      - id: set-languages
         run: |
           if [ "${{ inputs.language }}" == "all" ]; then
-            echo 'matrix={"language":["java","rb","py","dotnet","node"]}' >> $GITHUB_OUTPUT
+            echo '"languages=java rb py dotnet node" >> $GITHUB_OUTPUT
           else
-            echo 'matrix={"language":["${{ inputs.language }}"]}' >> $GITHUB_OUTPUT
+            echo "languages=${{ 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 +67,55 @@ jobs:
       - name: Setup curl for Ubuntu
         run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Setup Java
+        if: contains(needs.determine-languages.outputs.languages, 'java')
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
       - name: Set up Python 3.9
-        if: ${{ matrix.language == 'py' }}
+        if: contains(needs.determine-languages.outputs.languages, 'py')
         uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Install dependencies
-        if: ${{ matrix.language == 'py' }}
+        if: contains(needs.determine-languages.outputs.languages, 'py')
         run: |
           python -m pip install --upgrade pip
           pip install tox
       - name: Install npm dependencies
-        if: ${{ matrix.language == 'node' }}
+        if: contains(needs.determine-languages.outputs.languages, 'node')
         run: |
           npm install
           npm install --prefix javascript/selenium-webdriver
-      - name: Update Documentation
-        run: ./go ${{ matrix.language }}:docs
+      - name: Generate Documentation for selected langauges
+        run: |
+          read -r -a LANGS <<< "${{ needs.determine-languages.outputs.languages }}"
+          for lang in "${LANGS[@]}"; do
+            echo "Generating docs for $lang"
+            ./go $lang:docs
+          done
       - name: Documentation Pull Request
+        id: cpr
         uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.SELENIUM_CI_TOKEN }}
           author: Selenium CI Bot <selenium-ci@users.noreply.github.com>
           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 }}
           body: |
-            This PR updates the API documentation for **${{ matrix.language }}** language bindings to version **${{ inputs.version }}**.
-
-            - Auto-generated by [create-pull-request][1]
+            This PR updates the API documentation for version **${{ inputs.version }}**.
+            Languages updated: ${{ needs.determine-languages.outputs.languages }}
 
-            [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
diff --git a/Rakefile b/Rakefile
@@ -1195,8 +1195,6 @@ namespace :all do
     Rake::Task['rust:version'].invoke(version)
 
     unless version == 'nightly'
-      Rake::Task['all:changelogs'].invoke
-
       major_minor = arguments[:version][/^\d+\.\d+/]
       file = '.github/ISSUE_TEMPLATE/bug-report.yml'
       old_version_pattern = /The latest released version of Selenium is (\d+\.\d+)/
