Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ versions.check(

http_archive(
name = "io_bazel_rules_webtesting",
sha256 = "9bb461d5ef08e850025480bab185fd269242d4e533bca75bfb748001ceb343c3",
sha256 = "e9abb7658b6a129740c0b3ef6f5a2370864e102a5ba5ffca2cea565829ed825a",
urls = [
"http://mirror.tensorflow.org/github.com/bazelbuild/rules_webtesting/releases/download/0.3.3/rules_webtesting.tar.gz",
"https://github.com/bazelbuild/rules_webtesting/releases/download/0.3.3/rules_webtesting.tar.gz",
"http://mirror.tensorflow.org/github.com/bazelbuild/rules_webtesting/releases/download/0.3.5/rules_webtesting.tar.gz",
"https://github.com/bazelbuild/rules_webtesting/releases/download/0.3.5/rules_webtesting.tar.gz",
],
)

Expand Down
27 changes: 11 additions & 16 deletions third_party/chromium/BUILD
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
load("@io_bazel_rules_webtesting//web:web.bzl", "web_test_archive")

package(default_visibility = ["//tensorboard:internal"])

licenses(["notice"])
Expand All @@ -14,25 +12,22 @@ config_setting(
values = {"cpu": "k8"},
)

web_test_archive(
alias(
name = "chromium",
archive = "@org_chromium_chromium//file",
extract = "build",
named_files = select({
":linux": {
"CHROMIUM": "chrome-linux/chrome",
},
":mac": {
"CHROMIUM": "chrome-mac/Chromium.app/Contents/MacOS/chromium",
},
testonly = True,
actual = select({
":linux": "@org_chromium_chromium_linux_x64//:metadata",
":mac": "@org_chromium_chromium_macos//:metadata",
}),
visibility = ["//tensorboard/functionaltests/browsers:__pkg__"],
)

web_test_archive(
alias(
name = "chromedriver",
archive = "@org_chromium_chromedriver//file",
extract = "build",
named_files = {"CHROMEDRIVER": "chromedriver"},
testonly = True,
actual = select({
":linux": "@org_chromium_chromedriver_linux_x64//:metadata",
":mac": "@org_chromium_chromedriver_macos//:metadata",
}),
visibility = ["//tensorboard/functionaltests/browsers:__pkg__"],
)
79 changes: 56 additions & 23 deletions third_party/workspace.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ TensorBoard external dependencies that can be loaded in WORKSPACE files.
"""

load("@bazel_tools//tools/build_defs/repo:java.bzl", "java_import_external")
load("@io_bazel_rules_webtesting//web/internal:platform_http_file.bzl", "platform_http_file") # buildifier: disable=bzl-visibility
load("@io_bazel_rules_webtesting//web:web.bzl", "platform_archive")
load("@io_bazel_rules_webtesting//web/versioned:browsers-0.3.3.bzl", "browser_repositories")
load("//third_party:fonts.bzl", "tensorboard_fonts_workspace")
load("//third_party:python.bzl", "tensorboard_python_workspace")
load("//third_party:js.bzl", "tensorboard_js_workspace")
Expand Down Expand Up @@ -46,44 +47,76 @@ def tensorboard_workspace(name = ""):
actual = "@com_github_grpc_grpc//src/compiler:grpc_python_plugin",
)

platform_http_file(
name = "org_chromium_chromium", # pinned to Chromium 84.0.4147.0
# We use our own browser definition below, but this seems to be required by
# the rules_webtesting dependency.
browser_repositories(chromium = True)

# Chromium browser for multiple platforms, pinned to Chromium 84.0.4147.0.
platform_archive(
name = "org_chromium_chromium_linux_x64",
licenses = ["notice"], # BSD 3-clause (maybe more?)
amd64_sha256 =
"49b25bf32b797558eb7957ac7c60e065433bdef278f669291f71edd329505e27",
amd64_urls = [
sha256 = "49b25bf32b797558eb7957ac7c60e065433bdef278f669291f71edd329505e27",
urls = [
"https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/768959/chrome-linux.zip",
],
macos_sha256 =
"f0c7dc5c26061e2f179d1cb9819cb786d2c37cca9f53155e57ac2b6ab60c5cbc",
macos_urls = [
named_files = {
"CHROMIUM": "chrome-linux/chrome",
},
)

platform_archive(
name = "org_chromium_chromium_macos",
licenses = ["notice"], # BSD 3-clause (maybe more?)
sha256 = "f0c7dc5c26061e2f179d1cb9819cb786d2c37cca9f53155e57ac2b6ab60c5cbc",
urls = [
"https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/768938/chrome-mac.zip",
],
windows_sha256 =
"f441a079046a35afc249a95d29356f33945c0a60b59236b9cf6db532c69dba6f",
windows_urls = [
named_files = {
"CHROMIUM": "chrome-mac/Chromium.app/Contents/MacOS/chromium",
},
)

platform_archive(
name = "org_chromium_chromium_windows",
licenses = ["notice"], # BSD 3-clause (maybe more?)
sha256 = "f441a079046a35afc249a95d29356f33945c0a60b59236b9cf6db532c69dba6f",
urls = [
"https://commondatastorage.googleapis.com/chromium-browser-snapshots/Win_x64/768952/chrome-win.zip",
],
named_files = {
"CHROMIUM": "chrome-win/chrome.exe",
},
)

platform_http_file(
name = "org_chromium_chromedriver",
# Chromium webdriver for multiple platforms.
platform_archive(
name = "org_chromium_chromedriver_linux_x64",
licenses = ["reciprocal"], # BSD 3-clause, ICU, MPL 1.1, libpng (BSD/MIT-like), Academic Free License v. 2.0, BSD 2-clause, MIT
amd64_sha256 =
"71eafe087900dbca4bc0b354a1d172df48b31a4a502e21f7c7b156d7e76c95c7",
amd64_urls = [
sha256 = "71eafe087900dbca4bc0b354a1d172df48b31a4a502e21f7c7b156d7e76c95c7",
urls = [
"https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip",
],
macos_sha256 =
"fd32a27148f44796a55f5ce3397015c89ebd9f600d9dda2bcaca54575e2497ae",
macos_urls = [
named_files = {"CHROMEDRIVER": "chromedriver"},
)

platform_archive(
name = "org_chromium_chromedriver_macos",
licenses = ["reciprocal"], # BSD 3-clause, ICU, MPL 1.1, libpng (BSD/MIT-like), Academic Free License v. 2.0, BSD 2-clause, MIT
sha256 = "fd32a27148f44796a55f5ce3397015c89ebd9f600d9dda2bcaca54575e2497ae",
urls = [
"https://chromedriver.storage.googleapis.com/2.41/chromedriver_mac64.zip",
],
windows_sha256 =
"a8fa028acebef7b931ef9cb093f02865f9f7495e49351f556e919f7be77f072e",
windows_urls = [
named_files = {"CHROMEDRIVER": "chromedriver"},
)

platform_archive(
name = "org_chromium_chromedriver_windows",
licenses = ["reciprocal"], # BSD 3-clause, ICU, MPL 1.1, libpng (BSD/MIT-like), Academic Free License v. 2.0, BSD 2-clause, MIT
sha256 = "a8fa028acebef7b931ef9cb093f02865f9f7495e49351f556e919f7be77f072e",
urls = [
"https://chromedriver.storage.googleapis.com/2.38/chromedriver_win32.zip",
],
named_files = {"CHROMEDRIVER": "chromedriver"},
)

java_import_external(
Expand Down