Skip to content

Commit 1a03caa

Browse files
committed
merge trunk
2 parents 1092962 + 94007ce commit 1a03caa

File tree

358 files changed

+4351
-3704
lines changed

Some content is hidden

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

358 files changed

+4351
-3704
lines changed

.bazelrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ try-import %workspace%/.bazelrc.windows.local
88
# https://github.com/bazelbuild/bazel/issues/20369
99
# https://github.com/bazelbuild/bazel/issues/21491
1010

11-
common --enable_bzlmod --lockfile_mode=off
11+
common --lockfile_mode=off
12+
13+
# Prepare for Bazel 8. These become the default in 8.0.0
14+
common --incompatible_disallow_empty_glob
15+
common --incompatible_use_plus_in_repo_names
1216

1317
# Ensure Windows support is accurate.
1418

.github/workflows/bazel.yml

Lines changed: 4 additions & 4 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: ${{ format('{0}-latest', inputs.os) }}
73+
runs-on: ${{ contains(inputs.os, '-') && inputs.os || format('{0}-latest', inputs.os) }}
7474
env:
7575
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7676
SEL_M2_USER: ${{ secrets.SEL_M2_USER }}
@@ -122,7 +122,7 @@ jobs:
122122
node-version: ${{ inputs.node-version }}
123123
- name: Setup Bazel with caching
124124
if: inputs.caching
125-
uses: bazel-contrib/setup-bazel@0.9.1
125+
uses: bazel-contrib/setup-bazel@0.13.0
126126
with:
127127
bazelisk-cache: true
128128
bazelrc: common --color=yes
@@ -132,11 +132,11 @@ jobs:
132132
name: ${{ inputs.cache-key }}
133133
manifest:
134134
crates: rust/Cargo.Bazel.lock
135-
rules_ruby~~ruby~ruby: ${{ inputs.os == 'windows' && 'false' || 'rb/.ruby-version' }}
135+
rules_ruby++ruby+ruby: ${{ inputs.os == 'windows' && 'false' || 'rb/.ruby-version' }}
136136
repository-cache: true
137137
- name: Setup Bazel without caching
138138
if: inputs.caching == false
139-
uses: bazel-contrib/setup-bazel@0.9.1
139+
uses: bazel-contrib/setup-bazel@0.13.0
140140
with:
141141
bazelrc: common --color=yes
142142
- name: Setup Fluxbox and Xvfb

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

.github/workflows/ci-renovate-rbe.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
with:
4848
name: Check format script run
4949
caching: false
50-
ruby-version: jruby-9.4.9.0
50+
ruby-version: jruby-9.4.12.0
5151
run: ./scripts/github-actions/check-format.sh
5252

5353
test:
@@ -58,7 +58,7 @@ jobs:
5858
with:
5959
name: All RBE tests
6060
caching: false
61-
ruby-version: jruby-9.4.9.0
61+
ruby-version: jruby-9.4.12.0
6262
run: ./scripts/github-actions/ci-build.sh
6363

6464
ci-gh:

.github/workflows/ci-ruby.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,18 @@ jobs:
4747
os: macos
4848
- ruby-version: 3.3.5
4949
os: ubuntu
50-
- ruby-version: jruby-9.4.9.0
50+
- ruby-version: jruby-9.4.12.0
5151
os: ubuntu
5252
- ruby-version: truffleruby-24.1.1
5353
os: ubuntu
5454
with:
5555
name: Unit Tests (${{ matrix.ruby-version }}, ${{ matrix.os }})
56-
cache-key: rb-unit-test-${{ matrix.ruby-version }}
56+
cache-key: rb-unit-test-${{ matrix.ruby-version }}-${{ matrix.os }}
5757
os: ${{ matrix.os }}
5858
ruby-version: ${{ matrix.ruby-version }}
5959
run: >
6060
bazel test
61+
--keep_going
6162
--build_tests_only
6263
--test_size_filters small
6364
//rb/spec/...
@@ -82,10 +83,11 @@ jobs:
8283
with:
8384
name: Local Tests (${{ matrix.browser }}, ${{ matrix.os }})
8485
browser: ${{ matrix.browser }}
85-
cache-key: rb-${{ matrix.browser }}-test
86+
cache-key: rb-${{ matrix.browser }}-${{ matrix.os }}-test
8687
os: ${{ matrix.os }}
8788
run: >
8889
bazel test
90+
--keep_going
8991
--build_tests_only
9092
--flaky_test_attempts 3
9193
--local_test_jobs 1
@@ -107,11 +109,12 @@ jobs:
107109
with:
108110
name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
109111
browser: ${{ matrix.browser }}
110-
cache-key: rb-remote-${{ matrix.browser }}-test
112+
cache-key: rb-remote-${{ matrix.browser }}-${{ matrix.os }}-test
111113
os: ${{ matrix.os }}
112114
java-version: 11
113115
run: >
114116
bazel test
117+
--keep_going
115118
--build_tests_only
116119
--flaky_test_attempts 3
117120
--local_test_jobs 1

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
check:
1515
name: Check
1616
if: >
17-
github.repository_owner == 'seleniumhq' &&
17+
github.repository_owner == 'seleniumhq' &&
1818
(startsWith(github.head_ref, 'renovate/') != true || github.event_name == 'workflow_call')
1919
runs-on: ubuntu-latest
2020
outputs:
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
fetch-depth: 50
2727
- name: Setup Bazel
28-
uses: bazel-contrib/setup-bazel@0.9.1
28+
uses: bazel-contrib/setup-bazel@0.13.0
2929
with:
3030
bazelisk-cache: true
3131
cache-version: 2

.github/workflows/pre-release.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
persist-credentials: false
6767
fetch-depth: 0
6868
fetch-tags: true
69-
ref: release-${{ github.event.inputs.version }}
69+
ref: trunk
7070
- name: Install Ruby
7171
uses: ruby/setup-ruby@v1
7272
with:
@@ -78,8 +78,6 @@ jobs:
7878
run: |
7979
git config --local user.email "[email protected]"
8080
git config --local user.name "Selenium CI Bot"
81-
- name: Undo rust changelog commit
82-
run: git reset HEAD~1
8381
- name: Update everything including early release CDP
8482
if: ${{ github.event.inputs.chrome_channel == 'early-stable' }}
8583
run: ./go all:prepare[${{ github.event.inputs.version }},Beta]

.github/workflows/stale.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
stale-issue-label: 'I-stale'
2424
days-before-stale: 180
2525
days-before-close: 14
26+
exempt-all-milestones: true
2627
- uses: actions/stale@v9
2728
with:
2829
close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Brandon Walderman <[email protected]> <[email protected]>
1616
1717
1818
19+
1920
2021
2122
Daniel P. Purkhús <[email protected]>

AUTHORS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ elgatov <[email protected]>
267267
Eli Flanagan <[email protected]>
268268
Elias Faxö <[email protected]>
269269
Ellis Percival <[email protected]>
270+
Emil Hemdal <[email protected]>
270271
Enrique Daimiel <[email protected]>
271272
272273
Eran Messeri <[email protected]>
@@ -602,6 +603,7 @@ Michael Render <[email protected]>
602603
Michael Tamm <[email protected]>
603604
Michael Zhou <[email protected]>
604605
Michal Čihař <[email protected]>
606+
Michał Górny <[email protected]>
605607
Michał Herda <[email protected]>
606608
Michele Sama
607609
Mickaël Schoentgen <[email protected]>
@@ -648,6 +650,7 @@ native-api <[email protected]>
648650
649651
Naveen Singh <[email protected]>
650652
Navin Chandra <[email protected]>
653+
Navin Chandra <[email protected]>
651654
Navin Chandra <[email protected]>
652655
Neil Carvalho <[email protected]>
653656
Nelson Sproul <[email protected]>
@@ -889,6 +892,7 @@ Vijendarn Selvarajah <[email protected]>
889892
VijendraEAtech <[email protected]>
890893
Vikas Goel <[email protected]>
891894
VimalRaj Selvam <[email protected]>
895+
Vinaysimha Varma Yadavali <[email protected]>
892896
Vincent Ladeuil <[email protected]>
893897
vinoth959 <[email protected]>
894898
Viren Negi <[email protected]>

0 commit comments

Comments
 (0)