diff --git a/README.md b/README.md index 5201949..97b6424 100644 --- a/README.md +++ b/README.md @@ -18,12 +18,12 @@ load("@slamdev_toolchain_chromium//chromium:repositories.bzl", "chromium_registe toolchain_chromium_dependencies() chromium_register_toolchains( - name = "chromium961656", - chromium_revision = "961656", + name = "chromium1178", + chromium_revision = "1178", sha256 = { - "Mac_Arm": "0c34085537c08d7ccd912abf8e16cd5c548652c3f9f8e9b49b5e392897d9b737", - "Mac": "a658e17d5bd380c9979b09573bd4c98d0a0cf57a009c2fe125e52b86606e9d70", - "Linux_x64": "3467146abacd8fae1f2af72f5b51635b1e4e050e67a3ab4589a8cabf6937b8b5", + "Mac_Arm": "f9c151bc5e8868a1a8493a4704a5d701462f9094ef1f915417ad0919f34386cb", + "Mac": "85b29d14241b3236805e6aa458b79f3a1bdff57c45855bed553ef11d5e15d181", + "Linux_x64": "0eb52534de2ee34e978c546ddda54478772124e6e6bd1b492069cbd0ed95d36c", }, ) ``` diff --git a/WORKSPACE b/WORKSPACE index 35d8d17..add4a6c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,12 +15,12 @@ load("//chromium:repositories.bzl", "chromium_register_toolchains", "toolchain_c toolchain_chromium_dependencies() chromium_register_toolchains( - name = "chromium961656", - chromium_revision = "961656", + name = "chromium1178", + chromium_revision = "1178", sha256 = { - "Mac_Arm": "0c34085537c08d7ccd912abf8e16cd5c548652c3f9f8e9b49b5e392897d9b737", - "Mac": "a658e17d5bd380c9979b09573bd4c98d0a0cf57a009c2fe125e52b86606e9d70", - "Linux_x64": "3467146abacd8fae1f2af72f5b51635b1e4e050e67a3ab4589a8cabf6937b8b5", + "Mac_Arm": "f9c151bc5e8868a1a8493a4704a5d701462f9094ef1f915417ad0919f34386cb", + "Mac": "85b29d14241b3236805e6aa458b79f3a1bdff57c45855bed553ef11d5e15d181", + "Linux_x64": "0eb52534de2ee34e978c546ddda54478772124e6e6bd1b492069cbd0ed95d36c", }, ) diff --git a/chromium/private/toolchains_repo.bzl b/chromium/private/toolchains_repo.bzl index f1e44a8..26df190 100644 --- a/chromium/private/toolchains_repo.bzl +++ b/chromium/private/toolchains_repo.bzl @@ -22,6 +22,7 @@ with only the toolchain attribute pointing into the platform-specific repositori PLATFORMS = { "Mac_Arm": struct( os = "mac", + filename = "mac-arm64", compatible_with = [ "@platforms//os:macos", "@platforms//cpu:arm64", @@ -29,6 +30,7 @@ PLATFORMS = { ), "Mac": struct( os = "mac", + filename = "mac", compatible_with = [ "@platforms//os:macos", "@platforms//cpu:x86_64", @@ -36,6 +38,7 @@ PLATFORMS = { ), "Linux_x64": struct( os = "linux", + filename = "linux", compatible_with = [ "@platforms//os:linux", "@platforms//cpu:x86_64", diff --git a/chromium/repositories.bzl b/chromium/repositories.bzl index fcf9465..21c08a2 100644 --- a/chromium/repositories.bzl +++ b/chromium/repositories.bzl @@ -31,11 +31,12 @@ _ATTRS = { "chromium_revision": attr.string(mandatory = True), "platform": attr.string(mandatory = True, values = PLATFORMS.keys()), "os": attr.string(mandatory = True), + "filename": attr.string(mandatory = True), "sha256": attr.string(), } def _chromium_repo_impl(repository_ctx): - file_url = "https://gsdview.appspot.com/chromium-browser-snapshots/{}/{}/chrome-{}.zip".format(repository_ctx.attr.platform, repository_ctx.attr.chromium_revision, repository_ctx.attr.os) + file_url = "https://playwright.azureedge.net/builds/chromium/{}/chromium-{}.zip".format(repository_ctx.attr.chromium_revision, repository_ctx.attr.filename) repository_ctx.report_progress("Downloading and extracting CHROMIUM toolchain") repository_ctx.download_and_extract( @@ -95,6 +96,7 @@ def chromium_register_toolchains(name, sha256, **kwargs): name = name + "_" + platform, platform = platform, os = PLATFORMS[platform].os, + filename = PLATFORMS[platform].filename, sha256 = sha256[platform], **kwargs ) diff --git a/example/genrule/BUILD.bazel b/example/genrule/BUILD.bazel index 865bd37..c5c9612 100644 --- a/example/genrule/BUILD.bazel +++ b/example/genrule/BUILD.bazel @@ -4,8 +4,8 @@ load("@bazel_skylib//rules:diff_test.bzl", "diff_test") genrule( name = "actual", outs = ["actual.html"], - cmd = "$(CHROMIUM_BIN) --headless --disable-gpu --no-sandbox --disable-setuid-sandbox --dump-dom http://httpbin.org/base64/SFRUUEJJTiBpcyBhd2Vzb21l > $@", - toolchains = ["@chromium961656_toolchains//:resolved_toolchain"], + cmd = "$(CHROMIUM_BIN) --headless --disable-gpu --no-sandbox --disable-setuid-sandbox --dump-dom https://httpbin.org/base64/SFRUUEJJTiBpcyBhd2Vzb21l > $@", + toolchains = ["@chromium1178_toolchains//:resolved_toolchain"], ) write_file(