Skip to content

Commit 376b6e4

Browse files
committed
Merge remote-tracking branch 'upstream/trunk' into bidi-set-client-window-state
2 parents 0335935 + 00916fc commit 376b6e4

File tree

584 files changed

+18029
-9967
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

584 files changed

+18029
-9967
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ body:
5050
id: selenium-version
5151
attributes:
5252
label: What version of Selenium are you currently using?
53-
description: Important! The latest released version of Selenium is 4.33 and we can't fix old versions.
53+
description: Important! The latest released version of Selenium is 4.35 and we can't fix old versions.
5454
placeholder: e.g., 4.17.0
5555
validations:
5656
required: true

.github/label-commenter-config.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ labels:
117117
This is related to code in the Support packages. The support packages contain example code that
118118
many users find helpful, but they do not necessarily represent the best practices for using Selenium,
119119
and the Selenium team is not prioritizing work on them right now.
120-
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.
120+
This doesn't mean that we won't ever work on them, but it is not on our long term roadmap.
121121
122122
We actively encourage people to create their own wrapper and helper code that makes sense for them.
123123
If you have any questions, please [contact us](https://www.selenium.dev/support)
@@ -127,10 +127,12 @@ labels:
127127
128128
The support packages contain example code that many users find helpful, but they do not necessarily represent
129129
the best practices for using Selenium, and the Selenium team is not currently merging changes to them.
130+
131+
After reviewing the change, unless it is a critical fix or a feature that is needed for Selenium
132+
to work, we will likely close the PR.
130133
131134
We actively encourage people to add the wrapper and helper code that makes sense for them to their own frameworks.
132135
If you have any questions, please [contact us](https://www.selenium.dev/support)
133-
action: close
134136
135137
136138

.github/renovate.json

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
11
{
2-
"labels": ["B-dependencies"]
2+
"labels": [
3+
"B-dependencies"
4+
],
5+
"docker": {
6+
"enabled": false
7+
},
8+
"packageRules": [
9+
{
10+
"matchDatasources": [
11+
"docker"
12+
],
13+
"enabled": false
14+
},
15+
{
16+
"matchPackagePatterns": [
17+
"^docker:",
18+
"^gcr.io/",
19+
"^registry.k8s.io/",
20+
"^quay.io/",
21+
"^ghcr.io/"
22+
],
23+
"enabled": false
24+
}
25+
]
326
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Node.js
2626
uses: actions/setup-node@v4
2727
with:
28-
node-version: '18'
28+
node-version: '20'
2929
cache: 'npm'
3030
cache-dependency-path: 'javascript/grid-ui/package.json'
3131

.github/workflows/ci-java.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ jobs:
2323
java-version: 17
2424
run: |
2525
fsutil 8dot3name set 0
26-
bazel test --flaky_test_attempts 3 //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest `
26+
bazel test --flaky_test_attempts 3 --pin_browsers=true //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest `
2727
//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest `
2828
//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest `
2929
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest `
3030
//java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest `
31-
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
31+
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest `
32+
//java/test/org/openqa/selenium/devtools:NetworkInterceptorRestTest
3233
3334
browser-tests-macos:
3435
name: Browser Tests
@@ -47,7 +48,7 @@ jobs:
4748
# https://github.com/bazelbuild/rules_jvm_external/issues/1046
4849
java-version: 17
4950
run: |
50-
bazel test --flaky_test_attempts 3 //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote \
51+
bazel test --flaky_test_attempts 3 --pin_browsers=true //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote \
5152
//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest \
5253
//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest \
5354
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest \
@@ -71,4 +72,4 @@ jobs:
7172
# https://github.com/bazelbuild/rules_jvm_external/issues/1046
7273
java-version: 17
7374
run: |
74-
bazel test --flaky_test_attempts 3 //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote
75+
bazel test --flaky_test_attempts 3 --pin_browsers=true //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote

.github/workflows/ci-python.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
- name: Checkout source tree
2222
uses: actions/checkout@v4
2323
- name: Set up Python 3.9
24-
uses: actions/setup-python@v4
24+
uses: actions/setup-python@v6
2525
with:
2626
python-version: 3.9
2727
- name: Install dependencies
2828
run: |
2929
python -m pip install --upgrade pip
30-
pip install tox==4.25.0
30+
pip install tox==4.30.2
3131
- name: Generate docs
3232
run: tox -c py/tox.ini
3333
env:
@@ -41,13 +41,13 @@ jobs:
4141
- name: Checkout source tree
4242
uses: actions/checkout@v4
4343
- name: Set up Python 3.9
44-
uses: actions/setup-python@v4
44+
uses: actions/setup-python@v6
4545
with:
4646
python-version: 3.9
4747
- name: Install dependencies
4848
run: |
4949
python -m pip install --upgrade pip
50-
pip install tox==4.25.0
50+
pip install tox==4.30.2
5151
- name: Run type checking
5252
run: |
5353
tox -c py/tox.ini || true
@@ -89,8 +89,8 @@ jobs:
8989
os: ${{ matrix.os }}
9090
cache-key: py-browser-${{ matrix.browser }}
9191
run: |
92-
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:common-${{ matrix.browser }}-bidi
93-
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}
92+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi
93+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
9494
9595
safari-tests:
9696
name: Browser Tests
@@ -108,4 +108,4 @@ jobs:
108108
os: ${{ matrix.os }}
109109
cache-key: py-browser-${{ matrix.browser }}
110110
run: |
111-
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}
111+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}

.github/workflows/ci-ruby.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
--local_test_jobs 1
8585
--test_size_filters large
8686
--test_tag_filters ${{ matrix.browser }}
87-
${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
87+
--pin_browsers
8888
//rb/spec/...
8989
9090
integration-tests-remote:
@@ -111,5 +111,5 @@ jobs:
111111
--local_test_jobs 1
112112
--test_size_filters large
113113
--test_tag_filters ${{ matrix.browser }}-remote
114-
${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
114+
--pin_browsers
115115
//rb/spec/...

.github/workflows/pre-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
- name: Update browser versions
9494
run: ./go update_browsers ${{ github.event.inputs.chrome_channel }}
9595
- name: Commit browser updates
96-
run: git commit -m "update pinned browser versions"
96+
run: git commit -m "update pinned browser versions" || true
9797
- name: Update devtools versions
9898
run: ./go all:update_cdp ${{ github.event.inputs.chrome_channel }}
9999
- name: Commit DevTools updates

.github/workflows/stage-release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,5 @@ jobs:
8181
with:
8282
version: ${{ needs.github-release.outputs.version }}
8383
sha: ${{ github.sha }}
84+
secrets:
85+
SELENIUM_CI_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/stale@v9
2020
with:
21-
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.'
21+
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.'
2222
close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
2323
stale-issue-label: 'J-stale'
2424
stale-pr-label: 'J-stale'

0 commit comments

Comments
 (0)