Skip to content

Commit d538107

Browse files
authored
Merge branch 'trunk' into set-bidi-protocol-pref
2 parents c6557ad + 55301ee commit d538107

File tree

1,024 files changed

+11428
-26904
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,024 files changed

+11428
-26904
lines changed

.bazelignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ java/build/production
2323
java/client/build
2424
java/server/build
2525
javascript/grid-ui/node_modules
26-
javascript/node/selenium-webdriver/node_modules
26+
javascript/selenium-webdriver/node_modules
2727
node_modules

.bazelrc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ try-import %workspace%/.bazelrc.windows.local
88
# https://github.com/bazelbuild/bazel/issues/20369
99
# https://github.com/bazelbuild/bazel/issues/21491
1010

11-
common --enable_bzlmod --lockfile_mode=off
11+
common --lockfile_mode=off
12+
13+
# Prepare for Bazel 8. These become the default in 8.0.0
14+
common --incompatible_disallow_empty_glob
15+
common --incompatible_use_plus_in_repo_names
1216

1317
# Ensure Windows support is accurate.
1418

@@ -101,6 +105,7 @@ test --test_env=JRUBY_OPTS="--dev"
101105

102106
test:windows --test_env=PATH
103107
test:windows --test_env=LOCALAPPDATA
108+
test:windows --test_env=PROCESSOR_ARCHITECTURE
104109
test:windows --test_env=PROGRAMFILES="C:\\Program Files"
105110
test:windows --test_env=PROGRAMFILES(X86)="C:\\Program Files (x86)"
106111

@@ -114,9 +119,9 @@ build:release --stamp
114119
build:release --compilation_mode=opt
115120

116121
# As regular `release` but all the build work happens on the RBE
117-
build:remote_release --config=release
118-
build:remote_release --config=remote
119-
build:remote_release --remote_download_toplevel
122+
build:rbe_release --config=release
123+
build:rbe_release --config=rbe
124+
build:rbe_release --remote_download_toplevel
120125

121126
# RBE
122127
import %workspace%/.bazelrc.remote

.bazelrc.remote

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
# The RBE to use
2-
build:remote --bes_results_url=https://gypsum.cluster.engflow.com/invocation
3-
build:remote --bes_backend=grpcs://gypsum.cluster.engflow.com
4-
build:remote --remote_executor=grpcs://gypsum.cluster.engflow.com
5-
build:remote --remote_cache=grpcs://gypsum.cluster.engflow.com
2+
build:rbe --bes_results_url=https://gypsum.cluster.engflow.com/invocation
3+
build:rbe --bes_backend=grpcs://gypsum.cluster.engflow.com
4+
build:rbe --remote_executor=grpcs://gypsum.cluster.engflow.com
5+
build:rbe --remote_cache=grpcs://gypsum.cluster.engflow.com
66

77
# The number of cores available
8-
build:remote -j 50
8+
build:rbe -j 50
99

10-
build:remote --define=EXECUTOR=remote
11-
build:remote --experimental_inmemory_dotd_files
12-
build:remote --experimental_inmemory_jdeps_files
13-
build:remote --remote_timeout=3600
14-
build:remote --spawn_strategy=remote,local
15-
#build:remote --nolegacy_important_outputs
16-
build:remote --incompatible_strict_action_env=true
10+
build:rbe --define=EXECUTOR=remote
11+
build:rbe --experimental_inmemory_dotd_files
12+
build:rbe --experimental_inmemory_jdeps_files
13+
build:rbe --remote_timeout=3600
14+
build:rbe --spawn_strategy=remote,local
15+
#build:rbe --nolegacy_important_outputs
16+
build:rbe --incompatible_strict_action_env=true
1717

18-
build:remote --crosstool_top=//common/remote-build/cc:toolchain
19-
build:remote --extra_execution_platforms=//common/remote-build:platform
20-
build:remote --extra_toolchains=//common/remote-build:cc-toolchain
21-
build:remote --host_platform=//common/remote-build:platform
22-
build:remote --platforms=//common/remote-build:platform
23-
build:remote --cxxopt=-std=c++14
18+
build:rbe --crosstool_top=//common/remote-build/cc:toolchain
19+
build:rbe --extra_execution_platforms=//common/remote-build:platform
20+
build:rbe --extra_toolchains=//common/remote-build:cc-toolchain
21+
build:rbe --host_platform=//common/remote-build:platform
22+
build:rbe --platforms=//common/remote-build:platform
23+
build:rbe --cxxopt=-std=c++14
2424

2525
# The Docker images are running Linux
26-
build:remote --cpu=k8
27-
build:remote --host_cpu=k8
26+
build:rbe --cpu=k8
27+
build:rbe --host_cpu=k8
2828

29-
build:remote --disk_cache=
29+
build:rbe --disk_cache=
3030

31-
build:remote --incompatible_enable_cc_toolchain_resolution
32-
build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
33-
test:remote --test_env=DISPLAY=:99.0
34-
test:remote --test_tag_filters=-skip-remote,-remote
31+
build:rbe --incompatible_enable_cc_toolchain_resolution
32+
build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
33+
test:rbe --test_env=DISPLAY=:99.0
34+
test:rbe --test_tag_filters=-exclusive-if-local,-skip-rbe,-remote
3535

3636
# Env vars we can hard code
37-
build:remote --action_env=HOME=/home/dev
38-
build:remote --action_env=PATH=/bin:/usr/bin:/usr/local/bin
39-
test:remote --test_env=PATH=/bin:/usr/bin:/usr/local/bin
40-
test:remote --test_env=HOME=/home/dev
37+
build:rbe --action_env=HOME=/home/dev
38+
build:rbe --action_env=PATH=/bin:/usr/bin:/usr/local/bin
39+
test:rbe --test_env=PATH=/bin:/usr/bin:/usr/local/bin
40+
test:rbe --test_env=HOME=/home/dev
4141

4242
# Make sure we sniff credentials properly
43-
build:remote --credential_helper=gypsum.cluster.engflow.com=%workspace%/scripts/credential-helper.sh
43+
build:rbe --credential_helper=gypsum.cluster.engflow.com=%workspace%/scripts/credential-helper.sh
4444

4545
# Use pinned browsers when running remotely
46-
build:remote --//common:pin_browsers
46+
build:rbe --//common:pin_browsers
4747

4848
# The remote build machines are pretty small, and 50 threads may leave them
4949
# thrashing, but our dev machines are a lot larger. Scale the workload so we
5050
# make reasonable usage of everything, everywhere, all at once.
51-
build:remote --local_resources=cpu='HOST_CPUS*10'
52-
build:remote --local_resources=memory='HOST_RAM*4.0'
51+
build:rbe --local_resources=cpu='HOST_CPUS*10'
52+
build:rbe --local_resources=memory='HOST_RAM*4.0'
5353

5454
# A small hint that we're running our tests remotely
55-
test:remote --test_env=REMOTE_BUILD=1
55+
test:rbe --test_env=REMOTE_BUILD=1
5656

5757
# Wait for up to 5 minutes for a test to pass
58-
test:remote --test_timeout=600
58+
test:rbe --test_timeout=600
5959

6060
# Extend the remote config for CI
61-
build:remote-ci --config=remote
62-
build:remote-ci --curses=no --color=yes --show_timestamps --show_progress_rate_limit=5
63-
build:remote-ci --bes_upload_mode=wait_for_upload_complete
64-
build:remote-ci --remote_download_minimal
61+
build:rbe-ci --config=rbe
62+
build:rbe-ci --curses=no --color=yes --show_timestamps --show_progress_rate_limit=5
63+
build:rbe-ci --bes_upload_mode=wait_for_upload_complete
64+
build:rbe-ci --remote_download_minimal
6565

6666
# Configuration changes suggested by EngFlow
67-
build:remote --grpc_keepalive_time=30s
68-
build:remote --nolegacy_important_outputs
67+
build:rbe --grpc_keepalive_time=30s
68+
build:rbe --nolegacy_important_outputs

.github/label-commenter-config.yml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Configuration for Label Commenter - https://github.com/peaceiris/actions-label-commenter
22
labels:
3-
- name: needs-triaging
3+
- name: A-needs-triaging
44
labeled:
55
issue:
66
body: |
@@ -15,7 +15,7 @@ labels:
1515
Triage this issue by using labels.
1616
</p>
1717
<p>
18-
If information is missing, add a helpful comment and then <code>I-issue-template</code> label.
18+
If information is missing, add a helpful comment and then <code>J-issue-template</code> label.
1919
</p>
2020
<p>
2121
If the issue is a question, add the <code>I-question</code> label.
@@ -101,18 +101,18 @@ labels:
101101
102102
Feel free to comment the issues that you raise back in this issue. Thank you.
103103
action: close
104-
- name: I-issue-template
104+
- name: J-issue-template
105105
labeled:
106106
issue:
107107
body: |
108108
Hi, @{{ issue.user.login }}.
109-
Please follow the issue template, we need more information to reproduce the issue.
109+
Please follow the issue template; we need more information to reproduce the issue.
110110
111111
Either a complete code snippet and URL/HTML (if more than one file is needed, provide a GitHub repo and instructions to run the code), the specific versions used, or a more detailed description to help us understand the issue.
112112
113113
Note: If you cannot share your code and URL/HTML, any complete code snippet and URL/HTML that reproduces the issue is good enough.
114114
115-
Reply to this issue when all information is provided, thank you.
115+
Reply to this issue when all information is provided. Thank you.
116116
- name: I-question
117117
labeled:
118118
issue:
@@ -137,3 +137,29 @@ labels:
137137
138138
Please turn on logging and re-run your code. Information on how to adjust logs for your language can be found in our
139139
[Troubleshooting documentation](https://www.selenium.dev/documentation/webdriver/troubleshooting/logging/).
140+
- name: B-support
141+
labeled:
142+
issue:
143+
body: |
144+
Hi, @{{ issue.user.login }}.
145+
146+
This is related to code in the Support packages. The support packages contain example code that
147+
many users find helpful, but they do not necessarily represent the best practices for using Selenium,
148+
and the Selenium team is not prioritizing work on them right now.
149+
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.
150+
151+
We actively encourage people to create their own wrapper and helper code that makes sense for them.
152+
If you have any questions, please [contact us](https://www.selenium.dev/support)
153+
pr:
154+
body: |
155+
Thank you, @{{ pull_request.user.login }} for this code suggestion.
156+
157+
The support packages contain example code that many users find helpful, but they do not necessarily represent
158+
the best practices for using Selenium, and the Selenium team is not currently merging changes to them.
159+
160+
We actively encourage people to add the wrapper and helper code that makes sense for them to their own frameworks.
161+
If you have any questions, please [contact us](https://www.selenium.dev/support)
162+
action: close
163+
164+
165+

.github/pr-labeler-config.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
C-java:
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- 'java/**'
5+
6+
C-py:
7+
- changed-files:
8+
- any-glob-to-any-file:
9+
- 'py/**'
10+
11+
C-dotnet:
12+
- changed-files:
13+
- any-glob-to-any-file:
14+
- 'dotnet/**'
15+
16+
C-rb:
17+
- changed-files:
18+
- any-glob-to-any-file:
19+
- 'rb/**'
20+
21+
C-nodejs:
22+
- changed-files:
23+
- any-glob-to-any-file:
24+
- 'javascript/selenium-webdriver/**'
25+
26+
C-cpp:
27+
- changed-files:
28+
- any-glob-to-any-file:
29+
- 'cpp/**'
30+
31+
C-rust:
32+
- changed-files:
33+
- any-glob-to-any-file:
34+
- 'rust/**'
35+
36+
B-atoms:
37+
- changed-files:
38+
- any-glob-to-any-file:
39+
- 'javascript/atoms/**'
40+
41+
B-grid:
42+
- changed-files:
43+
- any-glob-to-any-file:
44+
- 'java/src/org/openqa/selenium/grid/**'
45+
- 'javascript/grid-ui/**'
46+
47+
B-manager:
48+
- changed-files:
49+
- any-glob-to-any-file:
50+
- 'rust/**'
51+
52+
B-devtools:
53+
- changed-files:
54+
- any-glob-to-any-file:
55+
- 'common/devtools/**'
56+
- '**/devtools/**'
57+
- '**/bidi/**'
58+
59+
B-build:
60+
- changed-files:
61+
- any-glob-to-any-file:
62+
- '.github/**'
63+
- 'scripts/**'
64+
- 'rake_tasks/**'
65+
- 'Rakefile'
66+
- 'BUILD.bazel'
67+
- '**/*.bazel'
68+
- '**/*.bzl'
69+
- '.bazel*'
70+
71+
B-support:
72+
- changed-files:
73+
- any-glob-to-any-file:
74+
- '**/support/**'

.github/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
changelog:
22
exclude:
33
labels:
4-
- dependencies
4+
- B-dependencies
55
authors:
66
- selenium-ci

.github/renovate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"labels": ["B-dependencies"]
3+
}

.github/workflows/bazel.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ on:
7070
jobs:
7171
bazel:
7272
name: ${{ inputs.name }}
73-
runs-on: ${{ format('{0}-latest', inputs.os) }}
73+
runs-on: ${{ contains(inputs.os, '-') && inputs.os || format('{0}-latest', inputs.os) }}
7474
env:
7575
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7676
SEL_M2_USER: ${{ secrets.SEL_M2_USER }}
@@ -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.9.1
125+
uses: bazel-contrib/setup-bazel@0.13.0
126126
with:
127127
bazelisk-cache: true
128128
bazelrc: common --color=yes
@@ -132,13 +132,16 @@ jobs:
132132
name: ${{ inputs.cache-key }}
133133
manifest:
134134
crates: rust/Cargo.Bazel.lock
135-
rules_ruby~~ruby~ruby: ${{ inputs.os == 'windows' && 'false' || 'rb/.ruby-version' }}
135+
rules_ruby++ruby+ruby: ${{ inputs.os == 'windows' && 'false' || 'rb/.ruby-version' }}
136136
repository-cache: true
137137
- name: Setup Bazel without caching
138138
if: inputs.caching == false
139-
uses: bazel-contrib/setup-bazel@0.9.1
139+
uses: bazel-contrib/setup-bazel@0.13.0
140140
with:
141141
bazelrc: common --color=yes
142+
- name: Setup curl for Ubuntu
143+
if: inputs.os == 'ubuntu'
144+
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
142145
- name: Setup Fluxbox and Xvfb
143146
if: inputs.os == 'ubuntu' && inputs.browser != ''
144147
run: |
@@ -152,9 +155,6 @@ jobs:
152155
- name: Setup Safari
153156
if: inputs.browser == 'safari'
154157
run: sudo safaridriver --enable
155-
- name: Setup curl for Ubuntu
156-
if: inputs.os == 'ubuntu'
157-
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
158158
- name: Run Bazel
159159
run: ${{ inputs.run }}
160160
- name: Start SSH session

.github/workflows/ci-rbe.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
name: Check format script run
1717
caching: false
18-
ruby-version: jruby-9.4.9.0
18+
ruby-version: jruby-9.4.12.0
1919
run: ./scripts/github-actions/check-format.sh
2020

2121
test:
@@ -25,5 +25,5 @@ jobs:
2525
with:
2626
name: All RBE tests
2727
caching: false
28-
ruby-version: jruby-9.4.9.0
28+
ruby-version: jruby-9.4.12.0
2929
run: ./scripts/github-actions/ci-build.sh

.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.9.0
50+
ruby-version: jruby-9.4.12.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.9.0
61+
ruby-version: jruby-9.4.12.0
6262
run: ./scripts/github-actions/ci-build.sh
6363

6464
ci-gh:

0 commit comments

Comments
 (0)