Skip to content

Commit 92e2b5b

Browse files
committed
Merge branch 'trunk' of github.com:aguspe/selenium into rb_bidi_nav
2 parents c84615f + fe5b198 commit 92e2b5b

File tree

1,309 files changed

+40443
-24461
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,309 files changed

+40443
-24461
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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
- dependencies
5+
authors:
6+
- selenium-ci

.github/workflows/bazel.yml

Lines changed: 6 additions & 3 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: ${{ inputs.os == 'macos' && 'macos-13' || format('{0}-latest', inputs.os) }}
73+
runs-on: ${{ format('{0}-latest', inputs.os) }}
7474
env:
7575
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7676
SEL_M2_USER: ${{ secrets.SEL_M2_USER }}
@@ -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/setup-bazel@0.8.5
119+
uses: bazel-contrib/setup-bazel@0.9.1
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/setup-bazel@0.8.5
133+
uses: bazel-contrib/setup-bazel@0.9.1
134134
with:
135135
bazelrc: common --color=yes
136136
- name: Setup Fluxbox and Xvfb
@@ -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: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
docs:
1717
name: Documentation
1818
needs: build
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout source tree
2222
uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
3636
lint:
3737
name: Lint
3838
needs: build
39-
runs-on: ubuntu-20.04
39+
runs-on: ubuntu-latest
4040
steps:
4141
- name: Checkout source tree
4242
uses: actions/checkout@v4
@@ -58,7 +58,7 @@ jobs:
5858
mypy:
5959
name: Mypy
6060
needs: build
61-
runs-on: ubuntu-20.04
61+
runs-on: ubuntu-latest
6262
steps:
6363
- name: Checkout source tree
6464
uses: actions/checkout@v4
@@ -81,8 +81,38 @@ jobs:
8181
name: Remote Tests
8282
needs: build
8383
uses: ./.github/workflows/bazel.yml
84+
strategy:
85+
fail-fast: false
86+
matrix:
87+
include:
88+
- browser: firefox
8489
with:
85-
name: Integration Tests (remote)
86-
browser: firefox
87-
cache-key: py-remote
90+
name: Integration Tests (remote, ${{ matrix.browser }})
91+
browser: ${{ matrix.browser }}
92+
cache-key: py-remote-${{ matrix.browser }}
8893
run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
94+
95+
browser-tests:
96+
name: Browser Tests
97+
needs: build
98+
uses: ./.github/workflows/bazel.yml
99+
strategy:
100+
fail-fast: false
101+
matrix:
102+
include:
103+
- browser: safari
104+
os: macos
105+
- browser: chrome
106+
os: ubuntu
107+
- browser: edge
108+
os: ubuntu
109+
- browser: firefox
110+
os: ubuntu
111+
with:
112+
name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
113+
browser: ${{ matrix.browser }}
114+
os: ${{ matrix.os }}
115+
cache-key: py-browser-${{ matrix.browser }}
116+
run: |
117+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:common-${{ matrix.browser }}-bidi
118+
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}

.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)