Enable win_arm64_msvc_compile on CI and CQ The bot seems to work now. Now that we have two arm64 builders for Windows, group them together. Also rename "32" and "64" categories to "x86" and "x64" to be less ambiguous and match the Windows ABI names. Change-Id: I0aa02889cb1be99daf82122860542420c2bec3df Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/58345 Reviewed-by: Bob Beck <bbe@google.com>
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg index de6f60f..e72f732 100644 --- a/generated/commit-queue.cfg +++ b/generated/commit-queue.cfg
@@ -221,7 +221,6 @@ } builders { name: "boringssl/try/win_arm64_msvc_compile" - includable_only: true } retry_config { single_quota: 1
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg index aa1bfe6..e3dc493 100644 --- a/generated/cr-buildbucket.cfg +++ b/generated/cr-buildbucket.cfg
@@ -2027,6 +2027,54 @@ value: 100 } } + builders { + name: "win_arm64_msvc_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.ci" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.boringssl"' + ' },' + ' "cmake_args": {' + ' "CMAKE_SYSTEM_NAME": "Windows",' + ' "CMAKE_SYSTEM_PROCESSOR": "arm64",' + ' "OPENSSL_NO_ASM": "1"' + ' },' + ' "gclient_vars": {' + ' "checkout_nasm": false' + ' },' + ' "msvc_target": "arm64",' + ' "recipe": "boringssl",' + ' "run_ssl_tests": false,' + ' "run_unit_tests": false' + '}' + execution_timeout_secs: 1800 + caches { + name: "gocache" + path: "gocache" + } + caches { + name: "gopath" + path: "gopath" + } + caches { + name: "win_toolchain" + path: "win_toolchain" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + } } } buckets {
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg index 545d19f..95cdb35 100644 --- a/generated/luci-milo.cfg +++ b/generated/luci-milo.cfg
@@ -201,68 +201,73 @@ } builders { name: "buildbucket/luci.boringssl.ci/win32" - category: "win|32" + category: "win|x86" short_name: "dbg" } builders { name: "buildbucket/luci.boringssl.ci/win32_rel" - category: "win|32" + category: "win|x86" short_name: "rel" } builders { name: "buildbucket/luci.boringssl.ci/win32_sde" - category: "win|32" + category: "win|x86" short_name: "sde" } builders { name: "buildbucket/luci.boringssl.ci/win32_small" - category: "win|32" + category: "win|x86" short_name: "sm" } builders { name: "buildbucket/luci.boringssl.ci/win32_vs2019" - category: "win|32" + category: "win|x86" short_name: "vs2019" } builders { name: "buildbucket/luci.boringssl.ci/win32_clang" - category: "win|32" + category: "win|x86" short_name: "clang" } builders { name: "buildbucket/luci.boringssl.ci/win64" - category: "win|64" + category: "win|x64" short_name: "dbg" } builders { name: "buildbucket/luci.boringssl.ci/win64_rel" - category: "win|64" + category: "win|x64" short_name: "rel" } builders { name: "buildbucket/luci.boringssl.ci/win64_sde" - category: "win|64" + category: "win|x64" short_name: "sde" } builders { name: "buildbucket/luci.boringssl.ci/win64_small" - category: "win|64" + category: "win|x64" short_name: "sm" } builders { name: "buildbucket/luci.boringssl.ci/win64_vs2019" - category: "win|64" + category: "win|x64" short_name: "vs2019" } builders { name: "buildbucket/luci.boringssl.ci/win64_clang" - category: "win|64" + category: "win|x64" short_name: "clg" } builders { name: "buildbucket/luci.boringssl.ci/win_arm64_compile" - category: "win" - short_name: "arm64" + category: "win|arm64" + short_name: "clang" + } + builders { + name: "buildbucket/luci.boringssl.ci/win_arm64_msvc_compile" + category: "win|arm64" + short_name: "msvc" } } logo_url: "https://storage.googleapis.com/chrome-infra/boringssl-logo.png"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg index 9019408..655046f 100644 --- a/generated/luci-notify.cfg +++ b/generated/luci-notify.cfg
@@ -769,3 +769,18 @@ repository: "https://boringssl.googlesource.com/boringssl" } } +notifiers { + notifications { + on_occurrence: FAILURE + on_occurrence: INFRA_FAILURE + on_new_status: SUCCESS + email { + recipients: "boringssl@google.com" + } + } + builders { + bucket: "ci" + name: "win_arm64_msvc_compile" + repository: "https://boringssl.googlesource.com/boringssl" + } +}
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg index 0003bdf..de3b8f6 100644 --- a/generated/luci-scheduler.cfg +++ b/generated/luci-scheduler.cfg
@@ -514,6 +514,16 @@ builder: "win_arm64_compile" } } +job { + id: "win_arm64_msvc_compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "win_arm64_msvc_compile" + } +} trigger { id: "master-gitiles-trigger" realm: "ci" @@ -569,6 +579,7 @@ triggers: "win64_small" triggers: "win64_vs2019" triggers: "win_arm64_compile" + triggers: "win_arm64_msvc_compile" gitiles { repo: "https://boringssl.googlesource.com/boringssl" refs: "regexp:refs/heads/master"
diff --git a/main.star b/main.star index 25e618f..ffb1c1b 100755 --- a/main.star +++ b/main.star
@@ -823,7 +823,7 @@ both_builders( "win32", WIN_HOST, - category = "win|32", + category = "win|x86", short_name = "dbg", properties = { "msvc_target": "x86", @@ -832,7 +832,7 @@ both_builders( "win32_rel", WIN_HOST, - category = "win|32", + category = "win|x86", short_name = "rel", properties = { "cmake_args": { @@ -844,7 +844,7 @@ ci_builder( "win32_sde", WIN_HOST, - category = "win|32", + category = "win|x86", short_name = "sde", execution_timeout = SDE_TIMEOUT, properties = { @@ -859,7 +859,7 @@ both_builders( "win32_small", WIN_HOST, - category = "win|32", + category = "win|x86", short_name = "sm", properties = { "cmake_args": { @@ -873,7 +873,7 @@ both_builders( "win32_vs2019", WIN_HOST, - category = "win|32", + category = "win|x86", short_name = "vs2019", cq_compile_only = WIN_HOST, # Reduce CQ cycle times. properties = { @@ -884,7 +884,7 @@ both_builders( "win32_clang", WIN_HOST, - category = "win|32", + category = "win|x86", short_name = "clang", cq_compile_only = WIN_HOST, # Reduce CQ cycle times. properties = { @@ -905,7 +905,7 @@ both_builders( "win64", WIN_HOST, - category = "win|64", + category = "win|x64", short_name = "dbg", properties = { "msvc_target": "x64", @@ -914,7 +914,7 @@ both_builders( "win64_rel", WIN_HOST, - category = "win|64", + category = "win|x64", short_name = "rel", properties = { "cmake_args": { @@ -926,7 +926,7 @@ ci_builder( "win64_sde", WIN_HOST, - category = "win|64", + category = "win|x64", short_name = "sde", execution_timeout = SDE_TIMEOUT, properties = { @@ -941,7 +941,7 @@ both_builders( "win64_small", WIN_HOST, - category = "win|64", + category = "win|x64", short_name = "sm", properties = { "cmake_args": { @@ -955,7 +955,7 @@ both_builders( "win64_vs2019", WIN_HOST, - category = "win|64", + category = "win|x64", short_name = "vs2019", cq_compile_only = WIN_HOST, # Reduce CQ cycle times. properties = { @@ -966,7 +966,7 @@ both_builders( "win64_clang", WIN_HOST, - category = "win|64", + category = "win|x64", short_name = "clg", cq_compile_only = WIN_HOST, # Reduce CQ cycle times. properties = { @@ -978,8 +978,8 @@ both_builders( "win_arm64_compile", WIN_HOST, - category = "win", - short_name = "arm64", + category = "win|arm64", + short_name = "clang", properties = { "clang": True, "cmake_args": { @@ -1000,11 +1000,11 @@ }, ) -# TODO(davidben): After confirming this configuration works, add it to CI. -cq_builder( +both_builders( "win_arm64_msvc_compile", WIN_HOST, - cq_enabled = False, + category = "win|arm64", + short_name = "msvc", properties = { "cmake_args": { # This is a cross-compile, so CMake needs to be told the processor.