Skip to content

Update to Bazel 7 #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 23, 2023
Merged

Update to Bazel 7 #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
13f6cb1
Update to Bazel 7
ralimi Dec 23, 2023
3d844af
Query external repository targets.
ralimi Dec 23, 2023
7b15d98
Also show chromedriver targets
ralimi Dec 23, 2023
9ebce7b
Attempt to copy files instead of symlink
ralimi Dec 23, 2023
57b2eb0
Force copy so it succeeds if dest already exists
ralimi Dec 23, 2023
ef6b8d4
Copy must also include file permissions
ralimi Dec 23, 2023
a5ac40e
Use chromedriver and chrome directly.
ralimi Dec 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# TODO Re-enable lockfile when supported by Renovate
# Blocked by https://github.com/renovatebot/renovate/issues/25557

# honor the setting of `skipLibCheck` in the tsconfig.json file; parameter required for aspect_rules_ts.
build --enable_bzlmod --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
fetch --enable_bzlmod --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
query --enable_bzlmod --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
build --lockfile_mode=off --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
fetch --lockfile_mode=off --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
query --lockfile_mode=off --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.4.0
7.0.0
16 changes: 2 additions & 14 deletions build_defs/chromium.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,7 @@ def chromium_data_dependencies():
name = "chromedriver",
build_file_content =
"""
genrule(
name = "chromedriver",
srcs = [":chromedriver_linux64/chromedriver"],
outs = ["chromedriver.bin"],
cmd = "ln $(location //:chromedriver_linux64/chromedriver) $@",
visibility = ["//visibility:public"],
)
exports_files(["chromedriver_linux64/chromedriver"])
""",
sha256 = "30c27c17133bf3622f0716e1bc70017dc338a6920ea1b1f3eb15f407150b927c",
# File within archive: chromedriver_linux64/chromedriver
Expand All @@ -32,13 +26,7 @@ genrule(
name = "chromium",
build_file_content =
"""
genrule(
name = "chromium",
srcs = [":chrome-linux/chrome"],
outs = ["chromium.bin"],
cmd = "ln $(location //:chrome-linux/chrome) $@",
visibility = ["//visibility:public"],
)
exports_files(["chrome-linux/chrome"])
""",
sha256 = "53899aaf90d9b9768dbc54beb869a314bdc8f4d04c2ef7bab2cb480581cfa197",
# File within archive: chrome-linux/chrome
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ go_test(
data = [
"//:chrome-ssh-agent.zip",
"//:chrome-ssh-agent-beta.zip",
"@chromedriver",
"@chromium",
"@chromedriver//:chromedriver_linux64/chromedriver",
"@chromium//:chrome-linux/chrome",
],
importpath = "github.com/google/chrome-ssh-agent/test",
deps = [
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/e2e.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
)

var (
chromeDriverPath = testutil.MustRunfile("_main~chromium_dependencies~chromedriver/chromedriver.bin")
chromePath = testutil.MustRunfile("_main~chromium_dependencies~chromium/chromium.bin")
chromeDriverPath = testutil.MustRunfile("_main~chromium_dependencies~chromedriver/chromedriver_linux64/chromedriver")
chromePath = testutil.MustRunfile("_main~chromium_dependencies~chromium/chrome-linux/chrome")
)

func getElementText(wd selenium.WebDriver, id string) (string, error) {
Expand Down