Skip to content

Commit 5600cc7

Browse files
authored
Merge branch 'trunk' into py_client_config_new
2 parents d6f16e7 + d1836b2 commit 5600cc7

File tree

924 files changed

+25109
-13117
lines changed

Some content is hidden

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

924 files changed

+25109
-13117
lines changed

.bazelrc

+10-2
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
@@ -90,6 +92,7 @@ test --test_env=JRUBY_OPTS="--dev"
9092

9193
# Expose necessary variables for Selenium-Manager.
9294

95+
test:windows --test_env=PATH
9396
test:windows --test_env=LOCALAPPDATA
9497
test:windows --test_env=PROGRAMFILES="C:\\Program Files"
9598
test:windows --test_env=PROGRAMFILES(X86)="C:\\Program Files (x86)"
@@ -99,9 +102,14 @@ test --test_timeout=1800
99102
test:node_debug --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results
100103
test:ruby_debug --test_output=streamed --test_env=RUBY_DEBUG_FORK_MODE=parent --run_under="@bundle//bin:rdbg --nonstop --open --command"
101104

102-
build:release --config=remote
105+
103106
build:release --stamp
104-
build:release --remote_download_outputs=toplevel
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

.bazelrc.remote

+1-3
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.1
1+
7.3.1

.github/dependabot.yml

-56
This file was deleted.

.github/release.yml

+6
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

+5-18
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].1
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].1
133+
uses: bazel-contrib/[email protected].5
134134
with:
135135
bazelrc: common --color=yes
136136
- name: Setup Fluxbox and Xvfb
@@ -143,25 +143,12 @@ 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
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
165152
- name: Run Bazel
166153
run: ${{ inputs.run }}
167154
- name: Start SSH session

.github/workflows/ci-javascript.yml

-42
This file was deleted.

.github/workflows/ci-ruby.yml

+2-14
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,12 @@ jobs:
7373
- chrome
7474
- edge
7575
- firefox
76-
- safari
7776
os:
78-
- ubuntu
7977
- windows
8078
- macos
8179
exclude:
82-
- browser: edge
83-
os: ubuntu
8480
- browser: edge
8581
os: macos
86-
- browser: safari
87-
os: ubuntu
88-
- browser: safari
89-
os: windows
9082
with:
9183
name: Local Tests (${{ matrix.browser }}, ${{ matrix.os }})
9284
browser: ${{ matrix.browser }}
@@ -99,6 +91,7 @@ jobs:
9991
--local_test_jobs 1
10092
--test_size_filters large
10193
--test_tag_filters ${{ matrix.browser }}
94+
${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
10295
//rb/spec/...
10396
10497
integration-tests-remote:
@@ -111,12 +104,6 @@ jobs:
111104
include:
112105
- browser: edge
113106
os: windows
114-
- browser: chrome
115-
os: ubuntu
116-
- browser: firefox
117-
os: ubuntu
118-
- browser: safari
119-
os: macos
120107
with:
121108
name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
122109
browser: ${{ matrix.browser }}
@@ -130,4 +117,5 @@ jobs:
130117
--local_test_jobs 1
131118
--test_size_filters large
132119
--test_tag_filters ${{ matrix.browser }}-remote
120+
${{ matrix.os != 'windows' && '--pin_browsers' || '' }}
133121
//rb/spec/...

.github/workflows/ci-rust.yml

+3-3
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"
@@ -163,7 +163,7 @@ jobs:
163163

164164
macos-stable:
165165
name: "MacOS Stable"
166-
runs-on: macos-latest
166+
runs-on: macos-13
167167
needs: tests
168168
if: github.event_name != 'schedule'
169169
env:
@@ -195,7 +195,7 @@ jobs:
195195

196196
macos-debug:
197197
name: "MacOS Debug"
198-
runs-on: macos-latest
198+
runs-on: macos-13
199199
needs: tests
200200
if: github.event_name != 'schedule'
201201
env:

.github/workflows/ci.yml

+1-12
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].1
24+
uses: bazel-contrib/[email protected].5
2525
with:
2626
bazelisk-cache: true
2727
cache-version: 2
@@ -59,17 +59,6 @@ jobs:
5959
contains(join(github.event.commits.*.message), '[java]') ||
6060
contains(github.event.pull_request.title, '[java]')
6161
62-
javascript:
63-
name: JavaScript
64-
needs: check
65-
uses: ./.github/workflows/ci-javascript.yml
66-
if: >
67-
github.event_name == 'schedule' ||
68-
github.event_name == 'workflow_dispatch' ||
69-
contains(needs.check.outputs.targets, '//javascript') ||
70-
contains(join(github.event.commits.*.message), '[js]') ||
71-
contains(github.event.pull_request.title, '[js]')
72-
7362
python:
7463
name: Python
7564
needs: check

.github/workflows/delete-comments.yml

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Delete Comments
2+
3+
on:
4+
issue_comment:
5+
types: [created]
6+
7+
permissions:
8+
issues: write
9+
10+
jobs:
11+
delete_comment:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check for specific strings in comment
15+
id: check_comment
16+
uses: actions/github-script@v7
17+
with:
18+
script: |
19+
const comment = context.payload.comment.body;
20+
const triggerStrings = ['www.mediafire.com'];
21+
return triggerStrings.some(triggerString => comment.includes(triggerString));
22+
23+
- name: Delete comment if it contains any of the specific strings
24+
if: steps.check_comment.outputs.result == 'true'
25+
uses: actions/github-script@v7
26+
with:
27+
script: |
28+
const commentId = context.payload.comment.id;
29+
await github.rest.issues.deleteComment({
30+
owner: context.repo.owner,
31+
repo: context.repo.repo,
32+
comment_id: commentId
33+
});
34+
35+
- name: Block user from the org if their comment contained any of the banned strings
36+
if: steps.check_comment.outputs.result == 'true'
37+
uses: actions/github-script@v7
38+
with:
39+
script: |
40+
const username = context.payload.comment.user.login
41+
await github.rest.orgs.blockUser({
42+
org: context.repo.owner,
43+
username: username
44+
});

0 commit comments

Comments
 (0)