Merge branch 'trunk' into bidi-command-typed-result

nvborisenko · web-flow · commit b1a47227cdca · 2025-04-05T00:15:25.000+03:00
diff --git a/.bazelrc.remote b/.bazelrc.remote
@@ -31,7 +31,7 @@ build:rbe --disk_cache=
 build:rbe --incompatible_enable_cc_toolchain_resolution
 build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 test:rbe --test_env=DISPLAY=:99.0
-test:rbe --test_tag_filters=-exclusive-if-local,-skip-rbe,-remote
+test:rbe --test_tag_filters=-skip-rbe,-remote
 
 # Env vars we can hard code
 build:rbe --action_env=HOME=/home/dev
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:
@@ -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: |
diff --git a/.github/workflows/issue-labeler.yml b/.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
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
@@ -25,24 +25,23 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0
-          fetch-tags: true
       - name: "Prep git"
         run: |
           git config --local user.email "selenium-ci@users.noreply.github.com"
           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 "selenium-ci@users.noreply.github.com"
           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,11 +111,11 @@ 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
-        run: ./go all:changelog
+        run: ./go all:changelogs
       - name: Commit changelog updates
         run: git commit -m "WIP - rough auto-update of changelog, please edit"
       - name: List untracked files
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
@@ -166,7 +166,7 @@ end
 desc 'Update Selenium Manager to latest release'
 task :update_manager do |_task, _arguments|
   puts 'Updating Selenium Manager references'
-  Bazel.execute('run', args, '//scripts:selenium_manager')
+  Bazel.execute('run', [], '//scripts:selenium_manager')
 
   @git.add('common/selenium_manager.bzl')
 end
@@ -1092,18 +1092,6 @@ namespace :rust do
     @git.add('rust/Cargo.Bazel.lock')
     @git.add('rust/Cargo.lock')
   end
-
-  # Creating a special task for this because Rust version needs to be managed at a different place than
-  # everything else; want to use changelog updates later in process
-  namespace :version do
-    desc 'Commits updates from Rust version changes'
-    task :commit do
-      @git.reset
-      commit!("update Rust version to #{rust_version}",
-              ['rust/BUILD.bazel', 'rust/Cargo.Bazel.lock', 'rust/Cargo.lock', 'rust/Cargo.toml'])
-      commit!('Rust Changelog', ['rust/CHANGELOG.md'])
-    end
-  end
 end
 
 namespace :all do
@@ -1181,6 +1169,7 @@ namespace :all do
     Rake::Task['py:lint'].invoke
   end
 
+  # Example: `./go all:prepare 4.31.0 early-stable`
   desc 'Update everything in preparation for a release'
   task :prepare, [:version, :channel] do |_task, arguments|
     version = arguments[:version]
@@ -1206,8 +1195,6 @@ namespace :all do
     Rake::Task['rust:version'].invoke(version)
 
     unless version == 'nightly'
-      Rake::Task['all:changelogs']
-
       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+)/
@@ -1324,13 +1311,3 @@ def update_changelog(version, language, path, changelog, header)
   File.write(changelog, "#{header}\n#{commits}\n\n#{content}")
   @git.add(changelog)
 end
-
-def commit!(message, files = [], all: false)
-  files.each do |file|
-    puts "adding: #{file}"
-    @git.add(file)
-  end
-  all ? @git.commit_all(message) : @git.commit(message)
-rescue Git::FailedError => e
-  puts e.message
-end
diff --git a/rb/spec/integration/selenium/webdriver/bidi/browsing_context_spec.rb b/rb/spec/integration/selenium/webdriver/bidi/browsing_context_spec.rb
diff --git a/rb/spec/integration/selenium/webdriver/fedcm_spec.rb b/rb/spec/integration/selenium/webdriver/fedcm_spec.rb
