Skip to content

Commit cd896b5

Browse files
cgoldbergcgoldberg
authored
Merge branch 'trunk' into chore/fix-mypy-warns
2 parents 17155c1 + 61d0169 commit cd896b5

File tree

13 files changed

+683
-720
lines changed

13 files changed

+683
-720
lines changed

‎MODULE.bazel‎

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

33
bazel_dep(name = "apple_rules_lint", version = "0.4.0")
4-
bazel_dep(name = "aspect_bazel_lib", version = "2.13.0")
4+
bazel_dep(name = "aspect_bazel_lib", version = "2.14.0")
55
bazel_dep(name = "aspect_rules_esbuild", version = "0.21.0")
66
bazel_dep(name = "aspect_rules_js", version = "2.3.7")
77
bazel_dep(name = "aspect_rules_ts", version = "3.6.0")
8-
bazel_dep(name = "bazel_features", version = "1.23.0")
9-
bazel_dep(name = "bazel_skylib", version = "1.7.1")
10-
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
8+
bazel_dep(name = "bazel_features", version = "1.32.0")
9+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
10+
bazel_dep(name = "buildifier_prebuilt", version = "7.3.1")
1111
bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
12-
bazel_dep(name = "platforms", version = "0.0.11")
12+
bazel_dep(name = "platforms", version = "1.0.0")
1313

1414
# Required for the closure rules
1515
bazel_dep(name = "protobuf", version = "29.2", dev_dependency = True, repo_name = "com_google_protobuf")
1616

1717
# Required for rules_rust to import the crates properly
18-
bazel_dep(name = "rules_cc", version = "0.2.0", dev_dependency = True)
18+
bazel_dep(name = "rules_cc", version = "0.2.8", dev_dependency = True)
1919

2020
bazel_dep(name = "rules_dotnet", version = "0.17.5")
2121
bazel_dep(name = "rules_java", version = "8.7.1")
@@ -27,6 +27,7 @@ bazel_dep(name = "rules_pkg", version = "1.0.1")
2727
bazel_dep(name = "rules_python", version = "1.6.3")
2828
bazel_dep(name = "rules_proto", version = "7.0.2")
2929
bazel_dep(name = "rules_ruby", version = "0.19.0")
30+
bazel_dep(name = "rules_rust", version = "0.67.0")
3031

3132
# Until `rules_jvm_external` 6.8 ships
3233
single_version_override(
@@ -367,6 +368,18 @@ use_repo(ruby, "bundle", "ruby", "ruby_toolchains")
367368

368369
register_toolchains("@ruby_toolchains//:all")
369370

371+
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
372+
rust.toolchain(versions = ["1.89.0"])
373+
374+
crate = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
375+
crate.from_cargo(
376+
name = "crates",
377+
cargo_lockfile = "//rust:Cargo.lock",
378+
lockfile = "//rust:Cargo.Bazel.lock",
379+
manifests = ["//rust:Cargo.toml"],
380+
)
381+
use_repo(crate, "crates")
382+
370383
selenium_manager_artifacts = use_extension("//common:selenium_manager.bzl", "selenium_manager_artifacts")
371384
use_repo(
372385
selenium_manager_artifacts,

‎WORKSPACE‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,3 @@ rules_closure_dependencies(
2020
)
2121

2222
rules_closure_toolchains()
23-
24-
# rules_rust fails to compile zstd on Windows when used with Bzlmod
25-
# so we keep it in WORKSPACE for now
26-
27-
http_archive(
28-
name = "rules_rust",
29-
integrity = "sha256-YrnH/f8jCpEqGAU+keNqauc+QSde9egtcFXqPtJuee4=",
30-
urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.65.0/rules_rust-0.65.0.tar.gz"],
31-
)
32-
33-
load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
34-
35-
rules_rust_dependencies()
36-
37-
rust_register_toolchains(versions = ["1.89.0"])
38-
39-
load("@rules_rust//crate_universe:defs.bzl", "crates_repository")
40-
41-
crates_repository(
42-
name = "crates",
43-
cargo_lockfile = "//rust:Cargo.lock",
44-
lockfile = "//rust:Cargo.Bazel.lock",
45-
manifests = ["//rust:Cargo.toml"],
46-
)
47-
48-
load("@crates//:defs.bzl", "crate_repositories")
49-
50-
crate_repositories()
51-
52-
load("@rules_rust//cargo:deps.bzl", "cargo_dependencies")
53-
54-
cargo_dependencies()

‎common/mirror/selenium‎

Lines changed: 0 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -590,136 +590,5 @@
590590
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-server-4.14.1.zip"
591591
}
592592
]
593-
},
594-
{
595-
"tag_name": "selenium-4.13.0",
596-
"assets": [
597-
{
598-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.13.0/selenium-dotnet-4.13.0.zip"
599-
},
600-
{
601-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.13.0/selenium-dotnet-4.13.1.zip"
602-
},
603-
{
604-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.13.0/selenium-dotnet-strongnamed-4.13.0.zip"
605-
},
606-
{
607-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.13.0/selenium-dotnet-strongnamed-4.13.1.zip"
608-
},
609-
{
610-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.13.0/selenium-java-4.13.0.zip"
611-
},
612-
{
613-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.13.0/selenium-server-4.13.0.jar"
614-
},
615-
{
616-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.13.0/selenium-server-4.13.0.zip"
617-
}
618-
]
619-
},
620-
{
621-
"tag_name": "selenium-4.12.0",
622-
"assets": [
623-
{
624-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-dotnet-4.12.0.zip"
625-
},
626-
{
627-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-dotnet-4.12.1.zip"
628-
},
629-
{
630-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-dotnet-4.12.2.zip"
631-
},
632-
{
633-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-dotnet-4.12.3.zip"
634-
},
635-
{
636-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-dotnet-4.12.4.zip"
637-
},
638-
{
639-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-dotnet-strongnamed-4.12.0.zip"
640-
},
641-
{
642-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-dotnet-strongnamed-4.12.1.zip"
643-
},
644-
{
645-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-dotnet-strongnamed-4.12.2.zip"
646-
},
647-
{
648-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-dotnet-strongnamed-4.12.3.zip"
649-
},
650-
{
651-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-dotnet-strongnamed-4.12.4.zip"
652-
},
653-
{
654-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-java-4.12.0.zip"
655-
},
656-
{
657-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-java-4.12.1.zip"
658-
},
659-
{
660-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-server-4.12.0.jar"
661-
},
662-
{
663-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-server-4.12.0.zip"
664-
},
665-
{
666-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-server-4.12.1.jar"
667-
},
668-
{
669-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.12.0/selenium-server-4.12.1.zip"
670-
}
671-
]
672-
},
673-
{
674-
"tag_name": "selenium-4.11.0",
675-
"assets": [
676-
{
677-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.11.0/IEDriverServer_Win32_4.11.0.zip"
678-
},
679-
{
680-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.11.0/IEDriverServer_x64_4.11.0.zip"
681-
},
682-
{
683-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.11.0/selenium-dotnet-4.11.0.zip"
684-
},
685-
{
686-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.11.0/selenium-dotnet-strongnamed-4.11.0.zip"
687-
},
688-
{
689-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.11.0/selenium-java-4.11.0.zip"
690-
},
691-
{
692-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.11.0/selenium-server-4.11.0.jar"
693-
},
694-
{
695-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.11.0/selenium-server-4.11.0.zip"
696-
}
697-
]
698-
},
699-
{
700-
"tag_name": "selenium-4.10.0",
701-
"assets": [
702-
{
703-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.10.0/IEDriverServer_Win32_4.10.0.zip"
704-
},
705-
{
706-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.10.0/IEDriverServer_x64_4.10.0.zip"
707-
},
708-
{
709-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.10.0/selenium-dotnet-4.10.0.zip"
710-
},
711-
{
712-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.10.0/selenium-dotnet-strongnamed-4.10.0.zip"
713-
},
714-
{
715-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.10.0/selenium-java-4.10.0.zip"
716-
},
717-
{
718-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.10.0/selenium-server-4.10.0.jar"
719-
},
720-
{
721-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.10.0/selenium-server-4.10.0.zip"
722-
}
723-
]
724593
}
725594
]

0 commit comments

Comments
 (0)