merge trunk

Author: RenderMichael

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -50,7 +50,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.33 and we can't fix old versions.
+      description: Important! The latest released version of Selenium is 4.36 and we can't fix old versions.
       placeholder: e.g., 4.17.0
     validations:
       required: true

.github/label-commenter-config.yml

@@ -117,7 +117,7 @@ labels:
           This is related to code in the Support packages. The support packages contain example code that
           many users find helpful, but they do not necessarily represent the best practices for using Selenium,
           and the Selenium team is not prioritizing work on them right now.
-          This doesn't mean that we won't ever work on them, but it is not on our roadmap as we push to release Selenium 5.
+          This doesn't mean that we won't ever work on them, but it is not on our long term roadmap.
 
           We actively encourage people to create their own wrapper and helper code that makes sense for them.
           If you have any questions, please [contact us](https://www.selenium.dev/support)
@@ -127,10 +127,12 @@ labels:
 
           The support packages contain example code that many users find helpful, but they do not necessarily represent
           the best practices for using Selenium, and the Selenium team is not currently merging changes to them.
+          
+          After reviewing the change, unless it is a critical fix or a feature that is needed for Selenium 
+          to work, we will likely close the PR.
 
           We actively encourage people to add the wrapper and helper code that makes sense for them to their own frameworks.
           If you have any questions, please [contact us](https://www.selenium.dev/support)
-        action: close
 
 
 

.github/renovate.json

@@ -1,3 +1,26 @@
 {
-  "labels": ["B-dependencies"]
+  "labels": [
+    "B-dependencies"
+  ],
+  "docker": {
+    "enabled": false
+  },
+  "packageRules": [
+    {
+      "matchDatasources": [
+        "docker"
+      ],
+      "enabled": false
+    },
+    {
+      "matchPackagePatterns": [
+        "^docker:",
+        "^gcr.io/",
+        "^registry.k8s.io/",
+        "^quay.io/",
+        "^ghcr.io/"
+      ],
+      "enabled": false
+    }
+  ]
 }

.github/workflows/ci-grid-ui.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'npm'
           cache-dependency-path: 'javascript/grid-ui/package.json'
 

.github/workflows/ci-java.yml

@@ -23,12 +23,13 @@ jobs:
       java-version: 17
       run: |
         fsutil 8dot3name set 0
-        bazel test --flaky_test_attempts 3 //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest `
+        bazel test --flaky_test_attempts 3 --pin_browsers=true //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest `
             //java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest `
             //java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest `
             //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest `
             //java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest `
-            //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
+            //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest `
+            //java/test/org/openqa/selenium/devtools:NetworkInterceptorRestTest
 
   browser-tests-macos:
     name: Browser Tests
@@ -47,7 +48,7 @@ jobs:
       # https://github.com/bazelbuild/rules_jvm_external/issues/1046
       java-version: 17
       run: |
-        bazel test --flaky_test_attempts 3 //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote \
+        bazel test --flaky_test_attempts 3 --pin_browsers=true //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote \
             //java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest \
           //java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest \
             //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest \
@@ -71,4 +72,4 @@ jobs:
       # https://github.com/bazelbuild/rules_jvm_external/issues/1046
       java-version: 17
       run: |
-        bazel test --flaky_test_attempts 3 //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote
+        bazel test --flaky_test_attempts 3 --pin_browsers=true //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote

.github/workflows/ci-python.yml

@@ -21,13 +21,13 @@ jobs:
       - name: Checkout source tree
         uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.25.0
+          pip install tox==4.30.2
       - name: Generate docs
         run: tox -c py/tox.ini
         env:
@@ -41,13 +41,13 @@ jobs:
       - name: Checkout source tree
         uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.25.0
+          pip install tox==4.30.2
       - name: Run type checking
         run: |
           tox -c py/tox.ini || true
@@ -89,8 +89,8 @@ jobs:
       os: ${{ matrix.os }}
       cache-key: py-browser-${{ matrix.browser }}
       run: |
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:common-${{ matrix.browser }}-bidi
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
 
   safari-tests:
     name: Browser Tests
@@ -108,4 +108,4 @@ jobs:
       os: ${{ matrix.os }}
       cache-key: py-browser-${{ matrix.browser }}
       run: |
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}

.github/workflows/ci-ruby.yml

@@ -84,7 +84,7 @@ jobs:
         --local_test_jobs 1
         --test_size_filters large
         --test_tag_filters ${{ matrix.browser }}
-        ${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
+        --pin_browsers
         //rb/spec/...
 
   integration-tests-remote:
@@ -96,7 +96,7 @@ jobs:
       matrix:
         include:
           - browser: edge
-            os: windows
+            os: macos
     with:
       name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
       browser: ${{ matrix.browser }}
@@ -111,5 +111,5 @@ jobs:
         --local_test_jobs 1
         --test_size_filters large
         --test_tag_filters ${{ matrix.browser }}-remote
-        ${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
+        --pin_browsers
         //rb/spec/...

.github/workflows/pre-release.yml

@@ -93,7 +93,7 @@ jobs:
       - name: Update browser versions
         run: ./go update_browsers ${{ github.event.inputs.chrome_channel }}
       - name: Commit browser updates
-        run: git commit -m "update pinned browser versions"
+        run: git commit -m "update pinned browser versions" || true
       - name: Update devtools versions
         run: ./go all:update_cdp ${{ github.event.inputs.chrome_channel }}
       - name: Commit DevTools updates

.github/workflows/stage-release.yml

@@ -81,3 +81,5 @@ jobs:
     with:
       version: ${{ needs.github-release.outputs.version }}
       sha: ${{ github.sha }}
+    secrets:
+      SELENIUM_CI_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}

.github/workflows/stale.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/stale@v9
         with:
-          stale-issue-message: 'This issue is stale because it has been open 280 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
+          stale-issue-message: 'This issue is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
           close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
           stale-issue-label: 'J-stale'
           stale-pr-label: 'J-stale'