Skip to content

Commit c84615f

Browse files
authored
Merge branch 'trunk' into rb_bidi_nav
2 parents c852f79 + 8960ff0 commit c84615f

File tree

168 files changed

+3403
-1645
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

+3403
-1645
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ test --test_env=JRUBY_OPTS="--dev"
9090

9191
# Expose necessary variables for Selenium-Manager.
9292

93+
test:windows --test_env=PATH
9394
test:windows --test_env=LOCALAPPDATA
9495
test:windows --test_env=PROGRAMFILES="C:\\Program Files"
9596
test:windows --test_env=PROGRAMFILES(X86)="C:\\Program Files (x86)"
@@ -101,7 +102,6 @@ test:ruby_debug --test_output=streamed --test_env=RUBY_DEBUG_FORK_MODE=parent --
101102

102103
build:release --config=remote
103104
build:release --stamp
104-
build:release --remote_download_outputs=toplevel
105105

106106
# RBE
107107
import %workspace%/.bazelrc.remote

.bazelrc.remote

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ build:remote --remote_cache=grpcs://gypsum.cluster.engflow.com
77
# The number of cores available
88
build:remote -j 50
99

10-
# Build Without The Bytes
11-
build:remote --remote_download_minimal
12-
1310
build:remote --define=EXECUTOR=remote
1411
build:remote --experimental_inmemory_dotd_files
1512
build:remote --experimental_inmemory_jdeps_files
@@ -64,6 +61,7 @@ test:remote --test_timeout=600
6461
build:remote-ci --config=remote
6562
build:remote-ci --curses=no --color=yes --show_timestamps --show_progress_rate_limit=5
6663
build:remote-ci --bes_upload_mode=wait_for_upload_complete
64+
build:remote-ci --remote_download_minimal
6765

6866
# Configuration changes suggested by EngFlow
6967
build:remote --grpc_keepalive_time=30s

.bazelversion

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

.github/workflows/bazel.yml

Lines changed: 2 additions & 18 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].4
119+
uses: bazel-contrib/[email protected].5
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].4
133+
uses: bazel-contrib/[email protected].5
134134
with:
135135
bazelrc: common --color=yes
136136
- name: Setup Fluxbox and Xvfb
@@ -143,22 +143,6 @@ jobs:
143143
- name: Set resolution
144144
if: inputs.os == 'windows' && inputs.browser != ''
145145
run: Set-DisplayResolution -Width 1920 -Height 1080 -Force
146-
- name: Setup Chrome
147-
if: inputs.browser == 'chrome'
148-
uses: browser-actions/setup-chrome@latest
149-
with:
150-
chrome-version: ${{ inputs.browser-version || 'stable' }}
151-
- name: Setup Firefox
152-
if: inputs.browser == 'firefox'
153-
uses: abhi1693/[email protected]
154-
with:
155-
browser: firefox
156-
version: ${{ inputs.browser-version || 'latest' }}
157-
- name: Setup Edge
158-
if: inputs.browser == 'edge'
159-
uses: browser-actions/setup-edge@latest
160-
with:
161-
edge-version: ${{ inputs.browser-version || 'stable' }}
162146
- name: Setup Safari
163147
if: inputs.browser == 'safari'
164148
run: sudo safaridriver --enable

.github/workflows/ci-javascript.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,9 @@ jobs:
1313
cache-key: javascript-build
1414
run: bazel build //javascript/node/selenium-webdriver:selenium-webdriver
1515

16-
small-tests:
17-
name: Small Tests
18-
needs: build
19-
uses: ./.github/workflows/bazel.yml
20-
with:
21-
name: Small Tests
22-
cache-key: javascript-small-tests
23-
run: bazel test //javascript/node/selenium-webdriver:small-tests
24-
2516
browser-tests:
2617
name: Browser Tests
27-
needs: small-tests
18+
needs: build
2819
uses: ./.github/workflows/bazel.yml
2920
strategy:
3021
fail-fast: false
@@ -40,4 +31,5 @@ jobs:
4031
bazel test
4132
--flaky_test_attempts 3
4233
--test_tag_filters ${{ matrix.browser }}
34+
--local_test_jobs 1
4335
//javascript/node/...

.github/workflows/ci-ruby.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ jobs:
9494
--local_test_jobs 1
9595
--test_size_filters large
9696
--test_tag_filters ${{ matrix.browser }}
97+
${{ matrix.os != 'windows' && '--pin_browsers=true' || '' }}
9798
//rb/spec/...
9899
99100
integration-tests-remote:
@@ -123,4 +124,5 @@ jobs:
123124
--local_test_jobs 1
124125
--test_size_filters large
125126
--test_tag_filters ${{ matrix.browser }}-remote
127+
${{ matrix.os != 'windows' && '--pin_browsers=true' || '' }}
126128
//rb/spec/...

.github/workflows/ci-rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
name: Tests (${{ matrix.os }})
4141
cache-key: rust-test
4242
os: ${{ matrix.os }}
43-
run: bazel test --test_env=RUST_BACKTRACE=1 --flaky_test_attempts=3 //rust/...
43+
run: bazel test --test_env=RUST_BACKTRACE=full --test_env=RUST_TEST_NOCAPTURE=1 --flaky_test_attempts=3 //rust/...
4444

4545
windows-stable:
4646
name: "Windows Stable"

.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].4
24+
uses: bazel-contrib/[email protected].5
2525
with:
2626
bazelisk-cache: true
2727
cache-version: 2

.github/workflows/nightly.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ jobs:
3737
cache-key: rb-nightly-${{ matrix.gem }}
3838
run: |
3939
export GEM_HOST_API_KEY="Bearer $GITHUB_TOKEN"
40-
bazel run //rb:${{ matrix.gem }}-bump-nightly-version ${{ inputs.version }}
41-
bazel run //rb:${{ matrix.gem }}-release-nightly
40+
./go rb:release[nightly]
4241
on-ruby-failure:
4342
name: On Ruby Failure
4443
runs-on: ubuntu-latest
@@ -64,11 +63,7 @@ jobs:
6463
with:
6564
name: Nightly Python Release
6665
cache-key: python-nightly
67-
run: |
68-
./go "py:version[nightly]"
69-
./go py:build
70-
pip install twine
71-
twine upload --repository testpypi bazel-bin/py/selenium-4*.whl bazel-bin/py/selenium-4*.tar.gz
66+
run: ./go py:release[nightly]
7267
secrets: inherit
7368
on-python-failure:
7469
name: On Python Failure
@@ -95,8 +90,7 @@ jobs:
9590
with:
9691
name: Nightly Java Release
9792
cache-key: java-nightly
98-
run: |
99-
./go publish-maven-snapshot
93+
run: ./go java:release[nightly]
10094
secrets: inherit
10195
on-java-failure:
10296
name: On Java Failure
@@ -124,9 +118,7 @@ jobs:
124118
name: Nightly DotNet Release
125119
cache-key: dotnet-nightly
126120
dotnet-version: '6.x'
127-
run: |
128-
./go "dotnet:version[nightly]"
129-
./go dotnet:release
121+
run: ./go dotnet:release[--stamp,nightly]
130122
secrets: inherit
131123
on-dotnet-failure:
132124
name: On .NET Failure
@@ -153,9 +145,7 @@ jobs:
153145
with:
154146
name: Nightly Grid Release
155147
cache-key: grid-nightly
156-
run: |
157-
echo build --stamp >>.bazelrc.local
158-
./go java-release-zip
148+
run: ./go java:package[--config=release]
159149
nightly-release-files: build/dist/*.*
160150
on-grid-failure:
161151
name: On Grid Failure
@@ -189,8 +179,7 @@ jobs:
189179
echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc
190180
echo "@seleniumhq:registry=https://npm.pkg.github.com" >> ~/.npmrc
191181
echo "always-auth=true" >> ~/.npmrc
192-
./go "node:version[nightly]"
193-
./go node:release
182+
./go node:release[--stamp,nightly]
194183
secrets: inherit
195184
on-javascript-failure:
196185
name: On JavaScript Failure

.github/workflows/pre-release.yml

Lines changed: 4 additions & 3 deletions
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@7dc18ff0ca6e3630d3f29d2a85ebf6cc27ae9d6c
71+
uses: ruby/setup-ruby@v1
7272
with:
7373
ruby-version: '3.1'
7474
working-directory: 'rb'
@@ -80,17 +80,18 @@ jobs:
8080
run: git reset HEAD~1
8181
- name: Update everything including early release CDP
8282
if: ${{ github.event.inputs.chrome_channel == 'early-stable' }}
83-
run: ./go all:prepare['Beta']
83+
run: ./go all:prepare[${{ github.event.inputs.version }},Beta]
8484
- name: Update everything including released CDP
8585
if: ${{ github.event.inputs.chrome_channel == 'stable' }}
86-
run: ./go "all:prepare[Stable]"
86+
run: ./go "all:prepare[${{ github.event.inputs.version }},Stable]"
8787
- name: Create Pull Request
8888
uses: peter-evans/create-pull-request@v6
8989
with:
9090
token: ${{ secrets.SELENIUM_CI_TOKEN }}
9191
author: Selenium CI Bot <[email protected]>
9292
delete-branch: true
9393
branch: release-preparation-${{ github.event.inputs.version }}
94+
base: trunk
9495
title: "[build] Prepare for release of Selenium ${{ github.event.inputs.version }}"
9596
body: |
9697
**Warning: Manually update the changelogs before merging**

0 commit comments

Comments
 (0)