Skip to content

Commit d747a3c

Browse files
authored
Merge branch 'trunk' into case-insensitive-hrader-name
2 parents 50b105e + ce96b41 commit d747a3c

File tree

86 files changed

+1237
-918
lines changed

Some content is hidden

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

86 files changed

+1237
-918
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/ci-javascript.yml

Lines changed: 1 addition & 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

.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/nightly.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ jobs:
3535
with:
3636
name: Nightly Ruby Release
3737
cache-key: rb-nightly-${{ matrix.gem }}
38-
run: |
39-
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
38+
env:
39+
GEM_HOST_API_KEY: "Bearer $GITHUB_TOKEN"
40+
run: ./go rb:release['nightly', '--config=release']
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', '--config=release']
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 publish-maven-snapshot
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['nightly', '--config=release']
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['nightly', '--config=release']
194183
secrets: inherit
195184
on-javascript-failure:
196185
name: On JavaScript Failure

.github/workflows/pre-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ jobs:
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**

BUILD.bazel

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ filegroup(
2121
visibility = ["//visibility:public"],
2222
)
2323

24+
filegroup(
25+
name = "rakefile",
26+
srcs = [
27+
"Rakefile",
28+
],
29+
visibility = ["//rb:__subpackages__",],
30+
)
31+
2432
alias(
2533
name = "grid",
2634
actual = "//java/src/org/openqa/selenium/grid:executable-grid",

MODULE.bazel

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,31 @@
11
module(name = "selenium")
22

33
bazel_dep(name = "apple_rules_lint", version = "0.3.2")
4-
bazel_dep(name = "aspect_bazel_lib", version = "2.7.6")
5-
bazel_dep(name = "aspect_rules_esbuild", version = "0.20.0")
4+
bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")
5+
bazel_dep(name = "aspect_rules_esbuild", version = "0.20.1")
66
bazel_dep(name = "aspect_rules_js", version = "1.42.3")
7-
bazel_dep(name = "aspect_rules_ts", version = "2.1.0")
8-
bazel_dep(name = "bazel_features", version = "1.12.0")
9-
bazel_dep(name = "bazel_skylib", version = "1.5.0")
7+
bazel_dep(name = "aspect_rules_ts", version = "2.4.2")
8+
bazel_dep(name = "bazel_features", version = "1.13.0")
9+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1010
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
1111
bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
1212
bazel_dep(name = "platforms", version = "0.0.10")
13+
14+
# Required for the closure rules
15+
bazel_dep(name = "protobuf", version = "21.7", dev_dependency = True, repo_name = "com_google_protobuf")
16+
17+
# Required for rules_rust to import the crates properly
18+
bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
19+
1320
bazel_dep(name = "rules_dotnet", version = "0.15.1")
14-
bazel_dep(name = "rules_java", version = "7.4.0")
21+
bazel_dep(name = "rules_java", version = "7.6.3")
1522
bazel_dep(name = "rules_jvm_external", version = "6.1")
16-
bazel_dep(name = "rules_nodejs", version = "6.0.5")
17-
bazel_dep(name = "rules_oci", version = "1.0.0")
18-
bazel_dep(name = "rules_pkg", version = "0.9.1")
19-
bazel_dep(name = "rules_python", version = "0.31.0")
20-
bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
21-
bazel_dep(name = "rules_ruby", version = "0.8.1")
23+
bazel_dep(name = "rules_nodejs", version = "6.2.0")
24+
bazel_dep(name = "rules_oci", version = "1.7.6")
25+
bazel_dep(name = "rules_pkg", version = "0.10.1")
26+
bazel_dep(name = "rules_python", version = "0.33.0")
27+
bazel_dep(name = "rules_proto", version = "6.0.0")
28+
bazel_dep(name = "rules_ruby", version = "0.11.0")
2229

2330
linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
2431
linter.configure(

0 commit comments

Comments
 (0)