Skip to content

Commit cd4b4f5

Browse files
authored
Merge branch 'trunk' into add_missing_events
2 parents b4ea59a + c5fb5a5 commit cd4b4f5

File tree

719 files changed

+21457
-14474
lines changed

Some content is hidden

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

719 files changed

+21457
-14474
lines changed

.bazelrc

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,26 @@ build --test_output=errors
4747

4848
# pass environment variables to the test environment
4949

50-
build --test_env=CI
51-
build --test_env=DASHBOARD_URL
52-
build --test_env=DISPLAY
53-
build --test_env=FIREFOX_NIGHTLY_BINARY
54-
build --test_env=GITHUB_ACTIONS
55-
build --test_env=MOZ_HEADLESS
56-
build --test_env=PATH # Remove once browser pinning works
57-
build --test_env=SELENIUM_BROWSER
58-
build --test_env=TRAVIS
59-
build --test_env=PYTHON_VERSION
50+
test --test_env=CI
51+
test --test_env=DASHBOARD_URL
52+
test --test_env=DISPLAY
53+
test --test_env=FIREFOX_NIGHTLY_BINARY
54+
test --test_env=GITHUB_ACTIONS
55+
test --test_env=MOZ_HEADLESS
56+
test --test_env=PATH # Remove once browser pinning works
57+
test --test_env=SELENIUM_BROWSER
58+
test --test_env=TRAVIS
59+
test --test_env=PYTHON_VERSION
6060

6161
# Remove once rules_ruby support proper $LOAD_PATH expansion.
6262

63-
build --test_env=RUBYOPT="-Irb/lib -w"
63+
test --test_env=RUBYOPT="-Irb/lib -w"
64+
65+
# Speed up JRuby startup.
66+
# https://github.com/jruby/jruby/wiki/Improving-startup-time
67+
68+
build --action_env=JRUBY_OPTS="--dev"
69+
test --test_env=JRUBY_OPTS="--dev"
6470

6571
# JRuby/TruffleRuby: https://github.com/jruby/jruby/issues/5661
6672

@@ -76,7 +82,7 @@ test:windows --test_env=PROGRAMFILES(X86)="C:\\Program Files (x86)"
7682
test --test_timeout=1800
7783

7884
test:node_debug --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results
79-
test:ruby_debug --test_output=streamed --test_env=RUBY_DEBUG_FORK_MODE=parent --run_under="@bundle//:bin/rdbg --nonstop --open --command"
85+
test:ruby_debug --test_output=streamed --test_env=RUBY_DEBUG_FORK_MODE=parent --run_under="@bundle//bin:rdbg --nonstop --open --command"
8086

8187
# The RBE to use
8288
build:remote --bes_results_url=https://gypsum.cluster.engflow.com/invocation
@@ -113,12 +119,14 @@ build:remote --disk_cache=
113119
build:remote --incompatible_enable_cc_toolchain_resolution
114120
build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
115121
test:remote --test_env=DISPLAY=:99.0
116-
test:remote --test_tag_filters=-edge,-safari,-remote
122+
test:remote --test_tag_filters=-skip-remote,-remote
117123

118124
# Env vars we can hard code
119125
build:remote --action_env=HOME=/home/dev
120126
build:remote --action_env=PATH=/bin:/usr/bin:/usr/local/bin
127+
test:remote --test_env=PATH=/bin:/usr/bin:/usr/local/bin
121128
test:remote --test_env=HOME=/home/dev
129+
test --test_env=SE_AVOID_STATS=true
122130

123131
# Make sure we sniff credentials properly
124132
build:remote --credential_helper=%workspace%/scripts/credential-helper.sh
@@ -146,3 +154,7 @@ build:remote-ci --bes_upload_mode=wait_for_upload_complete
146154
# Configuration changes suggested by EngFlow
147155
build:remote --grpc_keepalive_time=30s
148156
build:remote --nolegacy_important_outputs
157+
158+
build:release --config=remote
159+
build:release --stamp
160+
build:release --remote_download_outputs=toplevel

.github/label-commenter-config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,11 @@ labels:
129129
This issue is looking for contributors.
130130
131131
Please comment below or reach out to us through our [IRC/Slack/Matrix channels](https://www.selenium.dev/support/) if you are interested.
132+
- name: I-logging
133+
labeled:
134+
issue:
135+
body: |
136+
We need more information about this issue in order to troubleshoot.
137+
138+
Please turn on logging and re-run your code. Information on how to adjust logs for your language can be found in our
139+
[Troubleshooting documentation](https://www.selenium.dev/documentation/webdriver/troubleshooting/logging/).

.github/workflows/bazel.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5656
SEL_M2_USER: ${{ secrets.SEL_M2_USER }}
5757
SEL_M2_PASS: ${{ secrets.SEL_M2_PASS }}
58+
SE_AVOID_STATS: true
5859
steps:
5960
- name: Checkout source tree
6061
uses: actions/checkout@v4
@@ -70,36 +71,37 @@ jobs:
7071
- name: Remove driver directories Non-Windows
7172
if: inputs.os != 'windows'
7273
run: |
73-
sudo rm -rf $CHROMEWEBDRIVER $EDGEWEBDRIVER $GECKOWEBDRIVER
74+
sudo rm -rf "$CHROMEWEBDRIVER" "$EDGEWEBDRIVER" "$GECKOWEBDRIVER"
7475
- name: Set Ruby version
7576
if: inputs.ruby-version != ''
76-
run: echo 'RUBY_VERSION = "${{ inputs.ruby-version }}"' > rb/ruby_version.bzl
77+
run: echo '${{ inputs.ruby-version }}' > rb/.ruby-version
7778
- name: Setup Java
7879
if: inputs.java-version != ''
7980
uses: actions/setup-java@v3
8081
with:
8182
java-version: ${{ inputs.java-version }}
8283
distribution: 'temurin'
8384
- name: Setup Bazel
84-
uses: p0deje/setup-bazel@0.2.0
85+
uses: p0deje/setup-bazel@0.4.0
8586
with:
8687
bazelisk-cache: true
88+
bazelrc: common --color=yes
8789
disk-cache: ${{ inputs.cache-key }}
8890
external-cache: |
8991
name: ${{ inputs.cache-key }}
9092
manifest:
9193
crates: rust/Cargo.Bazel.lock
9294
npm: package-lock.json
9395
pypi__pip: py/requirements_lock.txt
94-
rules_ruby_dist: rb/ruby_version.bzl
96+
ruby: ${{ inputs.os == 'windows' && 'false' || 'rb/.ruby-version' }}
9597
repository-cache: true
9698
- name: Setup Fluxbox and Xvfb
9799
if: inputs.os == 'ubuntu' && inputs.browser != ''
98100
run: |
99101
sudo apt-get -y install fluxbox
100102
Xvfb :99 &
101103
fluxbox -display :99 &
102-
echo "DISPLAY=:99" >> $GITHUB_ENV
104+
echo "DISPLAY=:99" >> "$GITHUB_ENV"
103105
- name: Set resolution
104106
if: inputs.os == 'windows' && inputs.browser != ''
105107
run: Set-DisplayResolution -Width 1920 -Height 1080 -Force

.github/workflows/build-selenium-manager.yml

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

.github/workflows/ci-dotnet.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ jobs:
1212
name: Build
1313
cache-key: false
1414
os: windows
15-
run: |
16-
bazel build //dotnet/src/webdriver --stamp
17-
bazel build //dotnet/src/support --stamp
15+
run: bazel build //dotnet:all
1816

1917
integration-tests:
2018
name: Browser Tests
@@ -25,4 +23,4 @@ jobs:
2523
java-version: 17
2624
os: windows
2725
run: |
28-
bazel test //dotnet/test/common:ElementFindingTest-firefox //dotnet/test/common:ElementFindingTest-chrome --pin_browsers=true --stamp
26+
bazel test //dotnet/test/common:ElementFindingTest-firefox //dotnet/test/common:ElementFindingTest-chrome --pin_browsers=true

.github/workflows/ci-javascript.yml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,6 @@ jobs:
1212
name: Build
1313
cache-key: javascript-build
1414
run: bazel build //javascript/node/selenium-webdriver:selenium-webdriver
15-
16-
atoms:
17-
name: Atom Tests
18-
needs: build
19-
uses: ./.github/workflows/bazel.yml
20-
with:
21-
name: Atom Tests
22-
browser: firefox
23-
cache-key: atoms
24-
run: >
25-
bazel test --test_tag_filters=firefox,-firefox-beta,-firefox-dev
26-
//javascript/atoms/...
27-
//javascript/selenium-atoms/...
28-
//javascript/webdriver/...
29-
3015
browser-tests:
3116
name: Browser Tests
3217
needs: build
@@ -57,7 +42,7 @@ jobs:
5742
- name: Setup Node
5843
uses: actions/setup-node@v4
5944
with:
60-
node-version: 16
45+
node-version: 18
6146
- name: NPM install
6247
run: cd javascript/grid-ui && npm install
6348
- name: Run unit tests

.github/workflows/ci-python.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,6 @@ jobs:
7777
env:
7878
TOXENV: mypy
7979

80-
browser-tests:
81-
name: Browser Tests
82-
needs: build
83-
uses: ./.github/workflows/bazel.yml
84-
strategy:
85-
fail-fast: false
86-
matrix:
87-
browser:
88-
- chrome
89-
- firefox
90-
with:
91-
name: Integration Tests (${{ matrix.browser }})
92-
browser: ${{ matrix.browser }}
93-
cache-key: py-${{ matrix.browser }}
94-
run: bazel test --flaky_test_attempts 3 //py:test-${{ matrix.browser }}
95-
9680
remote-tests:
9781
name: Remote Tests
9882
needs: build

.github/workflows/ci-rbe.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,21 @@ on:
1010
jobs:
1111
format:
1212
name: Format
13+
if: github.repository_owner == 'seleniumhq'
1314
uses: ./.github/workflows/bazel.yml
1415
with:
1516
name: Check format script run
1617
cache-key: rbe
17-
ruby-version: jruby-9.4.2.0
18+
ruby-version: jruby-9.4.5.0
1819
run: ./scripts/github-actions/check-format.sh
20+
1921
test:
2022
name: Test
23+
if: github.repository_owner == 'seleniumhq'
2124
uses: ./.github/workflows/bazel.yml
2225
with:
2326
# TODO: experiment with turning off caches
2427
name: All RBE tests
2528
cache-key: rbe
26-
ruby-version: jruby-9.4.2.0
29+
ruby-version: jruby-9.4.5.0
2730
run: ./scripts/github-actions/ci-build.sh

.github/workflows/ci-ruby.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ jobs:
4343
os: ubuntu
4444
- ruby-version: 3.0.6
4545
os: windows
46-
- ruby-version: 3.2.0
47-
os: ubuntu
48-
- ruby-version: 3.2.0
46+
- ruby-version: 3.0.6
4947
os: macos
50-
- ruby-version: jruby-9.4.3.0
48+
- ruby-version: 3.3.0
49+
os: ubuntu
50+
- ruby-version: jruby-9.4.5.0
5151
os: ubuntu
52-
- ruby-version: truffleruby-22.3.0
52+
- ruby-version: truffleruby-23.1.1
5353
os: ubuntu
5454
with:
5555
name: Unit Tests (${{ matrix.ruby-version }}, ${{ matrix.os }})

0 commit comments

Comments
 (0)