Add mac_bazel and linux_bazel build configurations This is off by default for now, and not yet on CI. Once it has been confirmed to work, I'll enable it. Bug: 42290610 Change-Id: If2b1ba69b88472ed652b596b63b81b2b3fe5df4d Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/70769 Reviewed-by: Bob Beck <bbe@google.com>
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg index 702df56..0ae098c 100644 --- a/generated/commit-queue.cfg +++ b/generated/commit-queue.cfg
@@ -110,6 +110,10 @@ includable_only: true } builders { + name: "boringssl/try/linux_bazel" + includable_only: true + } + builders { name: "boringssl/try/linux_clang_cfi" includable_only: true } @@ -173,6 +177,10 @@ name: "boringssl/try/mac_arm64" } builders { + name: "boringssl/try/mac_arm64_bazel" + includable_only: true + } + builders { name: "boringssl/try/mac_rel" } builders {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg index 9c26bab..bce8469 100644 --- a/generated/cr-buildbucket.cfg +++ b/generated/cr-buildbucket.cfg
@@ -2793,6 +2793,28 @@ } } builders { + name: "linux_bazel" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-22.04" + dimensions: "pool:luci.flex.try" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "recipe": "boringssl_bazel"' + '}' + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + } + builders { name: "linux_clang_cfi" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -3332,6 +3354,32 @@ } } builders { + name: "mac_arm64_bazel" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:arm64" + dimensions: "os:Mac" + dimensions: "pool:luci.flex.try" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "recipe": "boringssl_bazel"' + '}' + execution_timeout_secs: 3600 + caches { + name: "osx_sdk" + path: "osx_sdk" + } + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + } + builders { name: "mac_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64"
diff --git a/generated/project.cfg b/generated/project.cfg index 63d57af..f91baed 100644 --- a/generated/project.cfg +++ b/generated/project.cfg
@@ -7,7 +7,7 @@ name: "boringssl" access: "group:all" lucicfg { - version: "1.43.6" + version: "1.43.13" package_dir: ".." config_dir: "generated" entry_point: "main.star"
diff --git a/main.star b/main.star index a5d1e4b..1013231 100755 --- a/main.star +++ b/main.star
@@ -810,6 +810,14 @@ }, }, ) +# TODO(crbug.com/42290610): Enable this builder on CI and by default on CQ once +# it has been confirmed to work. +cq_builder( + "linux_bazel", + LINUX_HOST, + recipe = "boringssl_bazel", + cq_enabled = False, +) both_builders("mac", MAC_X86_64_HOST, category = "mac", short_name = "dbg") both_builders( "mac_rel", @@ -835,6 +843,14 @@ }, ) both_builders("mac_arm64", MAC_ARM64_HOST, category = "mac", short_name = "arm64") +# TODO(crbug.com/42290610): Enable this builder on CI and by default on CQ once +# it has been confirmed to work. +cq_builder( + "mac_arm64_bazel", + MAC_ARM64_HOST, + recipe = "boringssl_bazel", + cq_enabled = False, +) both_builders( "win32", WIN_HOST,