Skip to content

Commit 8c60608

Browse files
committed
Merge branch 'trunk' into cleanup-py-api-doc-warnings
2 parents d10991b + cde43bc commit 8c60608

File tree

773 files changed

+26208
-17758
lines changed

Some content is hidden

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

773 files changed

+26208
-17758
lines changed

.bazelrc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ build --nobuild_runfile_links
3939

4040
# More JS magic
4141
build --experimental_allow_unresolved_symlinks
42+
# Avoid a warning about directory tracking being unsound
43+
startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
4244

4345
# Required for faster TS builds
4446
build --@aspect_rules_ts//ts:skipLibCheck=always
@@ -100,8 +102,14 @@ test --test_timeout=1800
100102
test:node_debug --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results
101103
test:ruby_debug --test_output=streamed --test_env=RUBY_DEBUG_FORK_MODE=parent --run_under="@bundle//bin:rdbg --nonstop --open --command"
102104

103-
build:release --config=remote
105+
104106
build:release --stamp
107+
build:release --compilation_mode=opt
108+
109+
# As regular `release` but all the build work happens on the RBE
110+
build:remote_release --config=release
111+
build:remote_release --config=remote
112+
build:remote_release --remote_download_toplevel
105113

106114
# RBE
107115
import %workspace%/.bazelrc.remote

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.0
1+
7.3.1

.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+
- dependencies
55
authors:
66
- selenium-ci

.github/workflows/bazel.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ jobs:
146146
- name: Setup Safari
147147
if: inputs.browser == 'safari'
148148
run: sudo safaridriver --enable
149+
- name: Setup curl for Ubuntu
150+
if: inputs.os == 'ubuntu'
151+
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
149152
- name: Run Bazel
150153
run: ${{ inputs.run }}
151154
- name: Start SSH session

.github/workflows/ci-dotnet.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ jobs:
2323
java-version: 17
2424
os: windows
2525
run: |
26+
fsutil 8dot3name set 0
2627
bazel test //dotnet/test/common:ElementFindingTest-firefox //dotnet/test/common:ElementFindingTest-chrome --pin_browsers=true

.github/workflows/ci-java.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
# https://github.com/bazelbuild/rules_jvm_external/issues/1046
2323
java-version: 17
2424
run: |
25+
fsutil 8dot3name set 0
2526
bazel test --flaky_test_attempts 3 //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest `
2627
//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest `
2728
//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest `

.github/workflows/ci-javascript.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/ci-python.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,15 @@ jobs:
8686
browser: firefox
8787
cache-key: py-remote
8888
run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
89+
90+
safari-tests:
91+
name: Safari Tests
92+
needs: build
93+
uses: ./.github/workflows/bazel.yml
94+
with:
95+
name: Integration Tests (safari)
96+
browser: safari
97+
os: macos
98+
cache-key: py-safari
99+
run: |
100+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-safari-test/selenium/webdriver/safari/launcher_tests.py

.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.5.0
18+
ruby-version: jruby-9.4.8.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.5.0
28+
ruby-version: jruby-9.4.8.0
2929
run: ./scripts/github-actions/ci-build.sh

.github/workflows/ci-ruby.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
include:
42-
- ruby-version: 3.0.6
42+
- ruby-version: 3.1.6
4343
os: ubuntu
44-
- ruby-version: 3.0.6
44+
- ruby-version: 3.1.6
4545
os: windows
46-
- ruby-version: 3.0.6
46+
- ruby-version: 3.1.6
4747
os: macos
48-
- ruby-version: 3.3.0
48+
- ruby-version: 3.3.5
4949
os: ubuntu
50-
- ruby-version: jruby-9.4.5.0
50+
- ruby-version: jruby-9.4.8.0
5151
os: ubuntu
52-
- ruby-version: truffleruby-23.1.1
52+
- ruby-version: truffleruby-24.1.1
5353
os: ubuntu
5454
with:
5555
name: Unit Tests (${{ matrix.ruby-version }}, ${{ matrix.os }})
@@ -74,12 +74,9 @@ jobs:
7474
- edge
7575
- firefox
7676
os:
77-
- ubuntu
7877
- windows
7978
- macos
8079
exclude:
81-
- browser: edge
82-
os: ubuntu
8380
- browser: edge
8481
os: macos
8582
with:
@@ -94,7 +91,7 @@ jobs:
9491
--local_test_jobs 1
9592
--test_size_filters large
9693
--test_tag_filters ${{ matrix.browser }}
97-
${{ matrix.os != 'windows' && '--pin_browsers=true' || '' }}
94+
${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
9895
//rb/spec/...
9996
10097
integration-tests-remote:
@@ -107,10 +104,6 @@ jobs:
107104
include:
108105
- browser: edge
109106
os: windows
110-
- browser: chrome
111-
os: ubuntu
112-
- browser: firefox
113-
os: ubuntu
114107
with:
115108
name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
116109
browser: ${{ matrix.browser }}
@@ -124,5 +117,5 @@ jobs:
124117
--local_test_jobs 1
125118
--test_size_filters large
126119
--test_tag_filters ${{ matrix.browser }}-remote
127-
${{ matrix.os != 'windows' && '--pin_browsers=true' || '' }}
120+
${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
128121
//rb/spec/...

0 commit comments

Comments
 (0)