Skip to content

Commit 3f38376

Browse files
authored
Merge branch 'trunk' into renovate/sphinx-1.x
2 parents 323f3ad + a27da44 commit 3f38376

File tree

168 files changed

+5795
-6947
lines changed

Some content is hidden

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

168 files changed

+5795
-6947
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.1
1+
7.1.2

.github/workflows/bazel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
node-version: ${{ inputs.node-version }}
117117
- name: Setup Bazel with caching
118118
if: inputs.caching
119-
uses: bazel-contrib/[email protected].1
119+
uses: bazel-contrib/[email protected].4
120120
with:
121121
bazelisk-cache: true
122122
bazelrc: common --color=yes
@@ -130,7 +130,7 @@ jobs:
130130
repository-cache: true
131131
- name: Setup Bazel without caching
132132
if: inputs.caching == false
133-
uses: bazel-contrib/[email protected].1
133+
uses: bazel-contrib/[email protected].4
134134
with:
135135
bazelrc: common --color=yes
136136
- name: Setup Fluxbox and Xvfb

.github/workflows/ci-ruby.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ jobs:
7373
- chrome
7474
- edge
7575
- firefox
76-
- safari
7776
os:
7877
- ubuntu
7978
- windows
@@ -83,10 +82,6 @@ jobs:
8382
os: ubuntu
8483
- browser: edge
8584
os: macos
86-
- browser: safari
87-
os: ubuntu
88-
- browser: safari
89-
os: windows
9085
with:
9186
name: Local Tests (${{ matrix.browser }}, ${{ matrix.os }})
9287
browser: ${{ matrix.browser }}
@@ -115,8 +110,6 @@ jobs:
115110
os: ubuntu
116111
- browser: firefox
117112
os: ubuntu
118-
- browser: safari
119-
os: macos
120113
with:
121114
name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
122115
browser: ${{ matrix.browser }}

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
fetch-depth: 50
2323
- name: Setup Bazel
24-
uses: bazel-contrib/[email protected].1
24+
uses: bazel-contrib/[email protected].4
2525
with:
2626
bazelisk-cache: true
2727
cache-version: 2

.github/workflows/nightly.yml

Lines changed: 105 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,23 @@ jobs:
3939
export GEM_HOST_API_KEY="Bearer $GITHUB_TOKEN"
4040
bazel run //rb:${{ matrix.gem }}-bump-nightly-version ${{ inputs.version }}
4141
bazel run //rb:${{ matrix.gem }}-release-nightly
42+
on-ruby-failure:
43+
name: On Ruby Failure
44+
runs-on: ubuntu-latest
45+
if: ${{ always() && (needs.ruby.result == 'failure' || needs.ruby.result == 'timed_out') }}
46+
needs: ruby
47+
steps:
48+
- uses: actions/checkout@v4
49+
- name: Slack Notification
50+
uses: rtCamp/action-slack-notify@v2
51+
env:
52+
SLACK_ICON_EMOJI: ":rotating_light:"
53+
SLACK_COLOR: ${{ needs.ruby.status }}
54+
SLACK_CHANNEL: selenium-tlc
55+
SLACK_USERNAME: GitHub Workflows
56+
SLACK_TITLE: Nightly Ruby ${{ needs.ruby.result }}
57+
MSG_MINIMAL: actions url
58+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
4259

4360
python:
4461
if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'python' || github.event_name == 'schedule')
@@ -53,7 +70,23 @@ jobs:
5370
pip install twine
5471
twine upload --repository testpypi bazel-bin/py/selenium-4*.whl bazel-bin/py/selenium-4*.tar.gz
5572
secrets: inherit
56-
73+
on-python-failure:
74+
name: On Python Failure
75+
runs-on: ubuntu-latest
76+
if: ${{ always() && (needs.python.result == 'failure' || needs.python.result == 'timed_out') }}
77+
needs: python
78+
steps:
79+
- uses: actions/checkout@v4
80+
- name: Slack Notification
81+
uses: rtCamp/action-slack-notify@v2
82+
env:
83+
SLACK_ICON_EMOJI: ":rotating_light:"
84+
SLACK_COLOR: ${{ needs.python.status }}
85+
SLACK_CHANNEL: selenium-tlc
86+
SLACK_USERNAME: GitHub Workflows
87+
SLACK_TITLE: Nightly Python ${{ needs.python.result }}
88+
MSG_MINIMAL: actions url
89+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
5790

5891
java:
5992
if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'java' || github.event_name == 'schedule')
@@ -65,6 +98,23 @@ jobs:
6598
run: |
6699
./go publish-maven-snapshot
67100
secrets: inherit
101+
on-java-failure:
102+
name: On Java Failure
103+
runs-on: ubuntu-latest
104+
if: ${{ always() && (needs.java.result == 'failure' || needs.java.result == 'timed_out') }}
105+
needs: java
106+
steps:
107+
- uses: actions/checkout@v4
108+
- name: Slack Notification
109+
uses: rtCamp/action-slack-notify@v2
110+
env:
111+
SLACK_ICON_EMOJI: ":rotating_light:"
112+
SLACK_COLOR: ${{ needs.java.status }}
113+
SLACK_CHANNEL: selenium-tlc
114+
SLACK_USERNAME: GitHub Workflows
115+
SLACK_TITLE: Nightly Java ${{ needs.java.result }}
116+
MSG_MINIMAL: actions url
117+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
68118

69119
dotnet:
70120
if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'dotnet' || github.event_name == 'schedule')
@@ -78,6 +128,23 @@ jobs:
78128
./go "dotnet:version[nightly]"
79129
./go dotnet:release
80130
secrets: inherit
131+
on-dotnet-failure:
132+
name: On .NET Failure
133+
runs-on: ubuntu-latest
134+
if: ${{ always() && (needs.dotnet.result == 'failure' || needs.dotnet.result == 'timed_out') }}
135+
needs: dotnet
136+
steps:
137+
- uses: actions/checkout@v4
138+
- name: Slack Notification
139+
uses: rtCamp/action-slack-notify@v2
140+
env:
141+
SLACK_ICON_EMOJI: ":rotating_light:"
142+
SLACK_COLOR: ${{ needs.dotnet.status }}
143+
SLACK_CHANNEL: selenium-tlc
144+
SLACK_USERNAME: GitHub Workflows
145+
SLACK_TITLE: Nightly .NET ${{ needs.dotnet.result }}
146+
MSG_MINIMAL: actions url
147+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
81148

82149
grid:
83150
if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'grid' || github.event_name == 'schedule')
@@ -90,6 +157,23 @@ jobs:
90157
echo build --stamp >>.bazelrc.local
91158
./go java-release-zip
92159
nightly-release-files: build/dist/*.*
160+
on-grid-failure:
161+
name: On Grid Failure
162+
runs-on: ubuntu-latest
163+
if: ${{ always() && (needs.grid.result == 'failure' || needs.grid.result == 'timed_out') }}
164+
needs: grid
165+
steps:
166+
- uses: actions/checkout@v4
167+
- name: Slack Notification
168+
uses: rtCamp/action-slack-notify@v2
169+
env:
170+
SLACK_ICON_EMOJI: ":rotating_light:"
171+
SLACK_COLOR: ${{ needs.grid.status }}
172+
SLACK_CHANNEL: selenium-tlc
173+
SLACK_USERNAME: GitHub Workflows
174+
SLACK_TITLE: Nightly Grid ${{ needs.grid.result }}
175+
MSG_MINIMAL: actions url
176+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
93177

94178
javascript:
95179
if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'javascript' || github.event_name == 'schedule')
@@ -102,9 +186,26 @@ jobs:
102186
run: |
103187
sed -i 's|https://registry.npmjs.org/|https://npm.pkg.github.com|g' javascript/node/selenium-webdriver/package.json
104188
sed -i 's|"name": "selenium-webdriver"|"name": "@seleniumhq/selenium-webdriver"|g' javascript/node/selenium-webdriver/package.json
105-
echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> .npmrc
106-
echo "@seleniumhq:registry=https://npm.pkg.github.com" >> .npmrc
107-
echo "always-auth=true" >> .npmrc
189+
echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc
190+
echo "@seleniumhq:registry=https://npm.pkg.github.com" >> ~/.npmrc
191+
echo "always-auth=true" >> ~/.npmrc
108192
./go "node:version[nightly]"
109193
./go node:release
110194
secrets: inherit
195+
on-javascript-failure:
196+
name: On JavaScript Failure
197+
runs-on: ubuntu-latest
198+
if: ${{ always() && (needs.javascript.result == 'failure' || needs.javascript.result == 'timed_out') }}
199+
needs: javascript
200+
steps:
201+
- uses: actions/checkout@v4
202+
- name: Slack Notification
203+
uses: rtCamp/action-slack-notify@v2
204+
env:
205+
SLACK_ICON_EMOJI: ":rotating_light:"
206+
SLACK_COLOR: ${{ needs.javascript.status }}
207+
SLACK_CHANNEL: selenium-tlc
208+
SLACK_USERNAME: GitHub Workflows
209+
SLACK_TITLE: Nightly JavaScript ${{ needs.javascript.result }}
210+
MSG_MINIMAL: actions url
211+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/pre-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
fetch-tags: true
6969
ref: release-${{ github.event.inputs.version }}
7070
- name: Install Ruby
71-
uses: ruby/setup-ruby@6615b4b8a02c78c4d711c06df4b8a20aa685a45d
71+
uses: ruby/setup-ruby@d5fb7a202fc07872cb44f00ba8e6197b70cb0c55
7272
with:
7373
ruby-version: '3.1'
7474
working-directory: 'rb'

.skipped-tests

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,10 @@
2727
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox
2828
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta
2929
-//rb/spec/integration/selenium/webdriver:element-chrome
30+
-//rb/spec/integration/selenium/webdriver/firefox:driver-firefox-beta
31+
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-bidi
32+
-//rb/spec/integration/selenium/webdriver/edge:service-edge-bidi
33+
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-bidi
34+
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta-bidi
35+
-//rb/spec/integration/selenium/webdriver:element-chrome-bidi
36+
-//rb/spec/integration/selenium/webdriver/firefox:driver-firefox-beta-bidi

MODULE.bazel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
module(name = "selenium")
22

33
bazel_dep(name = "apple_rules_lint", version = "0.3.2")
4-
bazel_dep(name = "aspect_bazel_lib", version = "2.5.3")
5-
bazel_dep(name = "aspect_rules_esbuild", version = "0.18.0")
6-
bazel_dep(name = "aspect_rules_js", version = "1.41.1")
4+
bazel_dep(name = "aspect_bazel_lib", version = "2.7.6")
5+
bazel_dep(name = "aspect_rules_esbuild", version = "0.20.0")
6+
bazel_dep(name = "aspect_rules_js", version = "1.42.3")
77
bazel_dep(name = "aspect_rules_ts", version = "2.1.0")
8-
bazel_dep(name = "bazel_features", version = "1.9.1")
8+
bazel_dep(name = "bazel_features", version = "1.12.0")
99
bazel_dep(name = "bazel_skylib", version = "1.5.0")
1010
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
11-
bazel_dep(name = "contrib_rules_jvm", version = "0.24.0")
12-
bazel_dep(name = "platforms", version = "0.0.8")
13-
bazel_dep(name = "rules_dotnet", version = "0.14.0")
11+
bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
12+
bazel_dep(name = "platforms", version = "0.0.10")
13+
bazel_dep(name = "rules_dotnet", version = "0.15.1")
1414
bazel_dep(name = "rules_java", version = "7.4.0")
1515
bazel_dep(name = "rules_jvm_external", version = "6.1")
1616
bazel_dep(name = "rules_nodejs", version = "6.0.5")

Rakefile

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -507,9 +507,20 @@ namespace :node do
507507
desc 'Release Node npm package'
508508
task deploy: :release
509509

510-
desc 'Generate Node documentation — currently not working'
510+
desc 'Generate Node documentation'
511511
task :docs, [:skip_update] do |_task, arguments|
512-
puts "WARNING — Cannot currently update API Docs for JavaScript bindings"
512+
FileUtils.rm_rf('build/docs/api/javascript/')
513+
begin
514+
sh 'npm run generate-docs --prefix javascript/node/selenium-webdriver || true', verbose: true
515+
rescue StandardError
516+
puts 'Ensure that npm is installed on your system'
517+
raise
518+
end
519+
520+
unless arguments[:skip_update]
521+
puts "Updating JavaScript documentation"
522+
puts update_gh_pages ? "JavaScript Docs updated!" : "JavaScript Doc update cancelled"
523+
end
513524
end
514525

515526
desc 'Update JavaScript changelog'
@@ -1308,7 +1319,7 @@ def update_gh_pages
13081319
retry
13091320
end
13101321

1311-
%w[java rb py dotnet].each do |language|
1322+
%w[java rb py dotnet javascript].each do |language|
13121323
if Dir.exist?("build/docs/api/#{language}") && !Dir.empty?("build/docs/api/#{language}")
13131324
puts "Deleting #{language} directory in docs/api since corresponding directory in build/docs/api is not empty"
13141325
FileUtils.rm_rf("docs/api/#{language}")

WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ rules_closure_toolchains()
4242

4343
http_archive(
4444
name = "rules_rust",
45-
integrity = "sha256-+bWb47wg0VchIADaHt6L5Dma2Gn+Q589nz/MKcTi+lo=",
46-
urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.45.1/rules_rust-v0.45.1.tar.gz"],
45+
integrity = "sha256-JLN47ZcAbx9wEr5Jiib4HduZATGLiDgK7oUi/fvotzU=",
46+
urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.42.1/rules_rust-v0.42.1.tar.gz"],
4747
)
4848

4949
load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")

0 commit comments

Comments
 (0)