Skip to content

Commit 3bc50e4

Browse files
authored
Merge branch 'trunk' into relax-ruby-base64-dependency-version
2 parents 048a207 + ef0f66c commit 3bc50e4

File tree

1,222 files changed

+74719
-64606
lines changed

Some content is hidden

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

1,222 files changed

+74719
-64606
lines changed

.bazelrc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ build --flag_alias=headless=//common:headless
2424

2525
# Set the default java toolchain
2626

27-
build --java_language_version=17
28-
build --java_runtime_version=remotejdk_17
29-
build --tool_java_language_version=17
30-
build --tool_java_runtime_version=remotejdk_17
27+
build --java_language_version=21
28+
build --java_runtime_version=remotejdk_21
29+
build --tool_java_language_version=21
30+
build --tool_java_runtime_version=remotejdk_21
3131

3232
# We target java 11 by default
3333

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,22 @@ body:
3535
label: Debugging Logs
3636
placeholder: |
3737
Note: the stack trace should be in the explanation section above
38-
Instructions for enabling logging can be found in the link below
38+
Instructions for enabling and referencing logs can be found in the links below
3939
render: logs
4040
- type: markdown
4141
id: link
4242
attributes:
4343
value: |
4444
**Read our [logging documentation](https://www.selenium.dev/documentation/webdriver/troubleshooting/logging/)**
45+
**Link to a [gist](https://gist.github.com/) if logs are too long**
4546
 
4647
4748
## Help us Address Your Issue Faster!
4849
- type: input
4950
id: selenium-version
5051
attributes:
5152
label: What version of Selenium are you currently using?
52-
description: Important! The latest released version of Selenium is 4.31 and we can't fix old versions.
53+
description: Important! The latest released version of Selenium is 4.34 and we can't fix old versions.
5354
placeholder: e.g., 4.17.0
5455
validations:
5556
required: true

.github/label-commenter-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ labels:
66
body: |
77
@{{ issue.user.login }}, thank you for creating this issue. We will troubleshoot it as soon as we can.
88
9-
Selenium Triage Team: remember to follow the [Triage Guide](https://github.com/SeleniumHQ/selenium/blob/trunk/README.md)
9+
Selenium Triage Team: remember to follow the [Triage Guide](https://github.com/SeleniumHQ/selenium/wiki/How-to-Triage-Issues)
1010
- name: G-w3c
1111
labeled:
1212
issue:

.github/workflows/bazel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
node-version: ${{ inputs.node-version }}
123123
- name: Setup Bazel with caching
124124
if: inputs.caching
125-
uses: bazel-contrib/setup-bazel@0.13.0
125+
uses: bazel-contrib/setup-bazel@0.15.0
126126
with:
127127
bazelisk-cache: true
128128
bazelrc: common --color=yes
@@ -136,7 +136,7 @@ jobs:
136136
repository-cache: true
137137
- name: Setup Bazel without caching
138138
if: inputs.caching == false
139-
uses: bazel-contrib/setup-bazel@0.13.0
139+
uses: bazel-contrib/setup-bazel@0.15.0
140140
with:
141141
bazelrc: common --color=yes
142142
- name: Setup curl for Ubuntu

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: CI - Grid UI
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- 'javascript/grid-ui/**'
7+
push:
8+
branches:
9+
- trunk
10+
paths:
11+
- 'javascript/grid-ui/**'
12+
workflow_dispatch:
13+
workflow_call:
14+
15+
jobs:
16+
grid-ui-tests:
17+
runs-on: ubuntu-latest
18+
name: Grid UI Component Tests
19+
steps:
20+
- name: Checkout source tree
21+
uses: actions/checkout@v4
22+
with:
23+
fetch-depth: 50
24+
25+
- name: Setup Node.js
26+
uses: actions/setup-node@v4
27+
with:
28+
node-version: '20'
29+
cache: 'npm'
30+
cache-dependency-path: 'javascript/grid-ui/package.json'
31+
32+
- name: Install dependencies
33+
working-directory: javascript/grid-ui
34+
run: npm install
35+
36+
- name: Run component tests
37+
working-directory: javascript/grid-ui
38+
run: npm test

.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: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,12 @@ jobs:
2727
- name: Install dependencies
2828
run: |
2929
python -m pip install --upgrade pip
30-
pip install tox==4.6.4
31-
- name: Test with tox
30+
pip install tox==4.27.0
31+
- name: Generate docs
3232
run: tox -c py/tox.ini
3333
env:
3434
TOXENV: docs
3535

36-
lint:
37-
name: Lint
38-
needs: build
39-
runs-on: ubuntu-latest
40-
steps:
41-
- name: Checkout source tree
42-
uses: actions/checkout@v4
43-
- name: Set up Python 3.9
44-
uses: actions/setup-python@v4
45-
with:
46-
python-version: 3.9
47-
- name: Install dependencies
48-
run: |
49-
python -m pip install --upgrade pip
50-
pip install tox==4.6.4
51-
- name: Test with tox
52-
run: tox -c py/tox.ini
53-
env:
54-
# If this fails, it will exit. Local work should be using `tox -e linting` prior to committing.
55-
# the linting-ci recipe exists solely for CI and will not attempt to rewrite any files in-place etc.
56-
TOXENV: linting-ci
57-
5836
mypy:
5937
name: Mypy
6038
needs: build
@@ -69,11 +47,10 @@ jobs:
6947
- name: Install dependencies
7048
run: |
7149
python -m pip install --upgrade pip
72-
pip install tox==4.6.4
73-
- name: Test with tox
50+
pip install tox==4.27.0
51+
- name: Run type checking
7452
run: |
75-
tox -c py/tox.ini -- --cobertura-xml-report ci || true
76-
bash <(curl -s https://codecov.io/bash) -f py/ci/cobertura.xml
53+
tox -c py/tox.ini || true
7754
env:
7855
TOXENV: mypy
7956

@@ -112,8 +89,8 @@ jobs:
11289
os: ${{ matrix.os }}
11390
cache-key: py-browser-${{ matrix.browser }}
11491
run: |
115-
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:common-${{ matrix.browser }}-bidi
116-
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 }}
11794
11895
safari-tests:
11996
name: Browser Tests
@@ -131,4 +108,4 @@ jobs:
131108
os: ${{ matrix.os }}
132109
cache-key: py-browser-${{ matrix.browser }}
133110
run: |
134-
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-rbe.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ on:
66
branches:
77
- trunk
88
workflow_dispatch:
9+
inputs:
10+
disable_test_cache:
11+
description: 'Force re-run of tests (disable test cache)'
12+
required: false
13+
default: false
14+
type: boolean
915

1016
jobs:
1117
format:
@@ -15,7 +21,7 @@ jobs:
1521
with:
1622
name: Check format script run
1723
caching: false
18-
ruby-version: jruby-9.4.12.0
24+
ruby-version: jruby-10.0.0.0
1925
run: ./scripts/github-actions/check-format.sh
2026

2127
test:
@@ -25,5 +31,5 @@ jobs:
2531
with:
2632
name: All RBE tests
2733
caching: false
28-
ruby-version: jruby-9.4.12.0
29-
run: ./scripts/github-actions/ci-build.sh
34+
ruby-version: jruby-10.0.0.0
35+
run: ./scripts/github-actions/ci-build.sh ${{ github.event.inputs.disable_test_cache }}

.github/workflows/ci-renovate-rbe.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
with:
4848
name: Check format script run
4949
caching: false
50-
ruby-version: jruby-9.4.12.0
50+
ruby-version: jruby-10.0.0.0
5151
run: ./scripts/github-actions/check-format.sh
5252

5353
test:
@@ -58,7 +58,7 @@ jobs:
5858
with:
5959
name: All RBE tests
6060
caching: false
61-
ruby-version: jruby-9.4.12.0
61+
ruby-version: jruby-10.0.0.0
6262
run: ./scripts/github-actions/ci-build.sh
6363

6464
ci-gh:

.github/workflows/ci-ruby.yml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@ jobs:
2222
cache-key: rb-docs
2323
run: bazel run //rb:docs
2424

25-
lint:
26-
name: Lint
27-
needs: build
28-
uses: ./.github/workflows/bazel.yml
29-
with:
30-
name: Lint
31-
cache-key: rb-lint
32-
run: bazel test //rb:lint
33-
3425
unit-tests:
3526
name: Unit Tests
3627
needs: build
@@ -39,17 +30,17 @@ jobs:
3930
fail-fast: false
4031
matrix:
4132
include:
42-
- ruby-version: 3.1.6
33+
- ruby-version: 3.2.8
4334
os: ubuntu
44-
- ruby-version: 3.1.6
35+
- ruby-version: 3.2.8
4536
os: windows
46-
- ruby-version: 3.1.6
37+
- ruby-version: 3.2.8
4738
os: macos
48-
- ruby-version: 3.3.5
39+
- ruby-version: 3.4.3
4940
os: ubuntu
50-
- ruby-version: jruby-9.4.12.0
41+
- ruby-version: jruby-10.0.0.0
5142
os: ubuntu
52-
- ruby-version: truffleruby-24.1.1
43+
- ruby-version: truffleruby-24.2.1
5344
os: ubuntu
5445
with:
5546
name: Unit Tests (${{ matrix.ruby-version }}, ${{ matrix.os }})
@@ -93,7 +84,7 @@ jobs:
9384
--local_test_jobs 1
9485
--test_size_filters large
9586
--test_tag_filters ${{ matrix.browser }}
96-
${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
87+
--pin_browsers
9788
//rb/spec/...
9889
9990
integration-tests-remote:
@@ -120,5 +111,5 @@ jobs:
120111
--local_test_jobs 1
121112
--test_size_filters large
122113
--test_tag_filters ${{ matrix.browser }}-remote
123-
${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
114+
--pin_browsers
124115
//rb/spec/...

0 commit comments

Comments
 (0)