Skip to content

Commit 8803c94

Browse files
authored
Merge branch 'trunk' into credential
2 parents e2d02a1 + c1a84a2 commit 8803c94

File tree

799 files changed

+63155
-55502
lines changed

Some content is hidden

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

799 files changed

+63155
-55502
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: 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.31 and we can't fix old versions.
53+
description: Important! The latest released version of Selenium is 4.33 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: 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: '18'
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-python.yml

Lines changed: 2 additions & 24 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
30+
pip install tox==4.25.0
3131
- name: Test with tox
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,7 +47,7 @@ jobs:
6947
- name: Install dependencies
7048
run: |
7149
python -m pip install --upgrade pip
72-
pip install tox==4.6.4
50+
pip install tox==4.25.0
7351
- name: Test with tox
7452
run: |
7553
tox -c py/tox.ini -- --cobertura-xml-report ci || true

.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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
include:
33-
- ruby-version: 3.1.6
33+
- ruby-version: 3.2.8
3434
os: ubuntu
35-
- ruby-version: 3.1.6
35+
- ruby-version: 3.2.8
3636
os: windows
37-
- ruby-version: 3.1.6
37+
- ruby-version: 3.2.8
3838
os: macos
39-
- ruby-version: 3.3.5
39+
- ruby-version: 3.4.3
4040
os: ubuntu
41-
- ruby-version: jruby-9.4.12.0
41+
- ruby-version: jruby-10.0.0.0
4242
os: ubuntu
43-
- ruby-version: truffleruby-24.1.1
43+
- ruby-version: truffleruby-24.2.1
4444
os: ubuntu
4545
with:
4646
name: Unit Tests (${{ matrix.ruby-version }}, ${{ matrix.os }})

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
fetch-depth: 50
2727
- name: Setup Bazel
28-
uses: bazel-contrib/setup-bazel@0.13.0
28+
uses: bazel-contrib/setup-bazel@0.15.0
2929
with:
3030
bazelisk-cache: true
3131
cache-version: 2

0 commit comments

Comments
 (0)