Skip to content

Commit 4a93b77

Browse files
authored
Merge branch 'trunk' into feat-10397/cleanup-html5-leftovers-node
2 parents 9da7c40 + 9b24abb commit 4a93b77

File tree

615 files changed

+39598
-33099
lines changed

Some content is hidden

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

615 files changed

+39598
-33099
lines changed

.bazelrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ test --test_env=FIREFOX_NIGHTLY_BINARY
8787
test --test_env=GITHUB_ACTIONS
8888
test --test_env=MOZ_HEADLESS
8989
test --test_env=SELENIUM_BROWSER
90-
test --test_env=TRAVIS
9190
test --test_env=PYTHON_VERSION
9291
test --test_env=SE_AVOID_STATS=true
9392

.bazelrc.remote

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ build:rbe --disk_cache=
3131
build:rbe --incompatible_enable_cc_toolchain_resolution
3232
build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
3333
test:rbe --test_env=DISPLAY=:99.0
34-
test:rbe --test_tag_filters=-skip-rbe,-remote
34+
test:rbe --test_tag_filters=-skip-rbe
3535

3636
# Env vars we can hard code
3737
build:rbe --action_env=HOME=/home/dev

.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.34 and we can't fix old versions.
53+
description: Important! The latest released version of Selenium is 4.38 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/bazel.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ on:
5151
required: false
5252
type: string
5353
default: ''
54+
python-version:
55+
description: Custom Python version to use
56+
required: false
57+
type: string
58+
default: ''
5459
ruby-version:
5560
description: Custom Ruby version to use
5661
required: false
@@ -101,6 +106,9 @@ jobs:
101106
if: inputs.os != 'windows'
102107
run: |
103108
sudo rm -rf "$CHROMEWEBDRIVER" "$EDGEWEBDRIVER" "$GECKOWEBDRIVER"
109+
- name: Set Python version
110+
if: inputs.python-version != ''
111+
run: echo '${{ inputs.python-version }}' > py/.python-version
104112
- name: Set Ruby version
105113
if: inputs.ruby-version != ''
106114
run: echo '${{ inputs.ruby-version }}' > rb/.ruby-version
@@ -126,6 +134,8 @@ jobs:
126134
with:
127135
bazelisk-cache: true
128136
bazelrc: common --color=yes
137+
# Workaround for long path issues: https://github.com/bazelbuild/bazel/pull/22532
138+
output-base: ${{ inputs.os == 'windows' && 'D://b' || '' }}
129139
cache-version: 2
130140
disk-cache: ${{ inputs.cache-key }}
131141
external-cache: |

.github/workflows/ci-java.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
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

.github/workflows/ci-python.yml

Lines changed: 65 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,49 +11,73 @@ jobs:
1111
with:
1212
name: Build
1313
cache-key: py-build
14-
run: bazel build //py:selenium-wheel //py:selenium-sdist
14+
run: |
15+
bazel build //py:selenium-wheel //py:selenium-sdist
1516
1617
docs:
1718
name: Documentation
18-
needs: build
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout source tree
2222
uses: actions/checkout@v4
23-
- name: Set up Python 3.9
24-
uses: actions/setup-python@v4
23+
- name: Set up Python 3.10
24+
uses: actions/setup-python@v6
2525
with:
26-
python-version: 3.9
26+
python-version: '3.10'
2727
- name: Install dependencies
2828
run: |
2929
python -m pip install --upgrade pip
30-
pip install tox==4.27.0
30+
pip install tox
3131
- name: Generate docs
32-
run: tox -c py/tox.ini
32+
run: |
33+
tox -c py/tox.ini
3334
env:
3435
TOXENV: docs
3536

36-
mypy:
37-
name: Mypy
38-
needs: build
37+
typing:
38+
name: Type Checker
3939
runs-on: ubuntu-latest
4040
steps:
4141
- name: Checkout source tree
4242
uses: actions/checkout@v4
43-
- name: Set up Python 3.9
44-
uses: actions/setup-python@v4
43+
- name: Set up Python 3.10
44+
uses: actions/setup-python@v6
4545
with:
46-
python-version: 3.9
46+
python-version: '3.10'
4747
- name: Install dependencies
4848
run: |
4949
python -m pip install --upgrade pip
50-
pip install tox==4.27.0
50+
pip install tox
5151
- name: Run type checking
5252
run: |
5353
tox -c py/tox.ini || true
5454
env:
5555
TOXENV: mypy
5656

57+
unit-tests:
58+
name: Unit Tests
59+
needs: build
60+
uses: ./.github/workflows/bazel.yml
61+
strategy:
62+
fail-fast: false
63+
matrix:
64+
include:
65+
- python-version: '3.10'
66+
os: ubuntu
67+
- python-version: '3.10'
68+
os: macos
69+
- python-version: '3.14'
70+
os: ubuntu
71+
- python-version: '3.14'
72+
os: macos
73+
with:
74+
name: Unit Tests (${{ matrix.python-version }}, ${{ matrix.os }})
75+
os: ${{ matrix.os }}
76+
python-version: ${{ matrix.python-version }}
77+
cache-key: python-unit-test-${{ matrix.python-version }}
78+
run: |
79+
bazel test //py:unit
80+
5781
remote-tests:
5882
name: Remote Tests
5983
needs: build
@@ -62,12 +86,13 @@ jobs:
6286
fail-fast: false
6387
matrix:
6488
include:
65-
- browser: firefox
89+
- browser: chrome
6690
with:
6791
name: Integration Tests (remote, ${{ matrix.browser }})
6892
browser: ${{ matrix.browser }}
6993
cache-key: py-remote-${{ matrix.browser }}
70-
run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
94+
run: |
95+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
7196
7297
browser-tests:
7398
name: Browser Tests
@@ -89,10 +114,30 @@ jobs:
89114
os: ${{ matrix.os }}
90115
cache-key: py-browser-${{ matrix.browser }}
91116
run: |
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 }}
117+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi //py:test-${{ matrix.browser }}
118+
119+
browser-tests-windows:
120+
name: Browser Tests
121+
needs: build
122+
uses: ./.github/workflows/bazel.yml
123+
strategy:
124+
fail-fast: false
125+
matrix:
126+
include:
127+
- browser: chrome
128+
os: windows
129+
- browser: edge
130+
os: windows
131+
with:
132+
name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
133+
browser: ${{ matrix.browser }}
134+
os: ${{ matrix.os }}
135+
cache-key: py-browser-${{ matrix.browser }}
136+
run: |
137+
fsutil 8dot3name set 0
138+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi //py:test-${{ matrix.browser }}
94139
95-
safari-tests:
140+
browser-tests-macos:
96141
name: Browser Tests
97142
needs: build
98143
uses: ./.github/workflows/bazel.yml
@@ -108,4 +153,4 @@ jobs:
108153
os: ${{ matrix.os }}
109154
cache-key: py-browser-${{ matrix.browser }}
110155
run: |
111-
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
156+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }} //py:test-${{ matrix.browser }}

.github/workflows/ci-ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
matrix:
9797
include:
9898
- browser: edge
99-
os: windows
99+
os: macos
100100
with:
101101
name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
102102
browser: ${{ matrix.browser }}

.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 }}

0 commit comments

Comments
 (0)