Roll windows toolchain Updated following http://go/windows-sdk-cipd-update. I had to allowlist new weak symbols, see bot failure below. ``` Found weak symbol without "the_boringssl_prefix": _Avx2WmemEnabledWeakValue Found weak symbol without "the_boringssl_prefix": time ``` https://ci.chromium.org/ui/p/boringssl/builders/try/win32_clang_prefixed_compile/b8682489395279125345/overview Change-Id: I91557cc09be921594373cf297acc66e500d98b67 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/94947 Auto-Submit: Victor Vianna <victorvianna@google.com> Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> Presubmit-BoringSSL-Verified: boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg index 8b365e6..04eaf86 100644 --- a/infra/config/generated/commit-queue.cfg +++ b/infra/config/generated/commit-queue.cfg
@@ -278,6 +278,10 @@ name: "boringssl/try/win32_small" } builders { + name: "boringssl/try/win32_vs2022" + includable_only: true + } + builders { name: "boringssl/try/win64" includable_only: true } @@ -322,6 +326,10 @@ name: "boringssl/try/win64_small" } builders { + name: "boringssl/try/win64_vs2022" + includable_only: true + } + builders { name: "boringssl/try/win_arm64_compile" } builders {
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index b532ef1..f1f4727 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg
@@ -1592,6 +1592,31 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "win32_vs2022" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "gclient_vars:{\"windows_sdk_version\":\"uploaded:2024-01-11\"}" + properties_j: "msvc_target:\"x86\"" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "win64" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -1825,6 +1850,31 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "win64_vs2022" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.ci" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" + properties_j: "gclient_vars:{\"windows_sdk_version\":\"uploaded:2024-01-11\"}" + properties_j: "msvc_target:\"x64\"" + } + execution_timeout_secs: 1800 + caches { + name: "boringssl_gocache" + path: "gocache" + } + caches { + name: "boringssl_gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "win_arm64_compile" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -3239,6 +3289,22 @@ service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "win32_vs2022" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "gclient_vars:{\"windows_sdk_version\":\"uploaded:2024-01-11\"}" + properties_j: "msvc_target:\"x86\"" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "win64" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -3463,6 +3529,22 @@ service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { + name: "win64_vs2022" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + dimensions: "pool:luci.flex.try" + recipe { + name: "boringssl" + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + properties_j: "gclient_vars:{\"windows_sdk_version\":\"uploaded:2024-01-11\"}" + properties_j: "msvc_target:\"x64\"" + } + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + } + builders { name: "win_arm64_compile" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64"
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg index abde2b7..77e5423 100644 --- a/infra/config/generated/luci-milo.cfg +++ b/infra/config/generated/luci-milo.cfg
@@ -276,6 +276,11 @@ short_name: "dbg" } builders { + name: "buildbucket/luci.boringssl.ci/win32_vs2022" + category: "win|x86|msvc" + short_name: "vs22" + } + builders { name: "buildbucket/luci.boringssl.ci/win32_rel" category: "win|x86|msvc" short_name: "rel" @@ -321,6 +326,11 @@ short_name: "dbg" } builders { + name: "buildbucket/luci.boringssl.ci/win64_vs2022" + category: "win|x86-64|msvc" + short_name: "vs22" + } + builders { name: "buildbucket/luci.boringssl.ci/win64_rel" category: "win|x86-64|msvc" short_name: "rel"
diff --git a/infra/config/generated/luci-notify.cfg b/infra/config/generated/luci-notify.cfg index 8cde303..03b1a0b 100644 --- a/infra/config/generated/luci-notify.cfg +++ b/infra/config/generated/luci-notify.cfg
@@ -930,6 +930,21 @@ } builders { bucket: "ci" + name: "win32_vs2022" + repository: "https://boringssl.googlesource.com/boringssl" + } +} +notifiers { + notifications { + on_occurrence: FAILURE + on_occurrence: INFRA_FAILURE + on_new_status: SUCCESS + email { + recipients: "boringssl-interrupts@rotations.google.com" + } + } + builders { + bucket: "ci" name: "win64" repository: "https://boringssl.googlesource.com/boringssl" } @@ -1065,6 +1080,21 @@ } builders { bucket: "ci" + name: "win64_vs2022" + repository: "https://boringssl.googlesource.com/boringssl" + } +} +notifiers { + notifications { + on_occurrence: FAILURE + on_occurrence: INFRA_FAILURE + on_new_status: SUCCESS + email { + recipients: "boringssl-interrupts@rotations.google.com" + } + } + builders { + bucket: "ci" name: "win_arm64_compile" repository: "https://boringssl.googlesource.com/boringssl" }
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg index 5d774d0..02e62b5 100644 --- a/infra/config/generated/luci-scheduler.cfg +++ b/infra/config/generated/luci-scheduler.cfg
@@ -615,6 +615,16 @@ } } job { + id: "win32_vs2022" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "win32_vs2022" + } +} +job { id: "win64" realm: "ci" acl_sets: "ci" @@ -705,6 +715,16 @@ } } job { + id: "win64_vs2022" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "win64_vs2022" + } +} +job { id: "win_arm64_compile" realm: "ci" acl_sets: "ci" @@ -809,6 +829,7 @@ triggers: "win32_shared" triggers: "win32_shared_prefixed" triggers: "win32_small" + triggers: "win32_vs2022" triggers: "win64" triggers: "win64_clang" triggers: "win64_clang_prefixed_compile" @@ -818,6 +839,7 @@ triggers: "win64_shared" triggers: "win64_shared_prefixed" triggers: "win64_small" + triggers: "win64_vs2022" triggers: "win_arm64_compile" triggers: "win_arm64_msvc_compile" triggers: "win_arm64_msvc_prefixed_compile"
diff --git a/infra/config/generated/project.cfg b/infra/config/generated/project.cfg index 1bed02a..a7f0869 100644 --- a/infra/config/generated/project.cfg +++ b/infra/config/generated/project.cfg
@@ -7,7 +7,7 @@ name: "boringssl" access: "group:all" lucicfg { - version: "1.46.2" + version: "1.46.3" package_dir: ".." config_dir: "generated" entry_point: "main.star"
diff --git a/infra/config/main.star b/infra/config/main.star index e1213b9..66381ed 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -1250,6 +1250,19 @@ "msvc_target": "x86", }, ) + +both_builders( + "win32_vs2022", + WIN_HOST, + cq_enabled = False, + short_name = "vs22", + properties = { + "msvc_target": "x86", + "gclient_vars": { + "windows_sdk_version": "uploaded:2024-01-11", + }, + }, +) both_builders( "win32_rel", WIN_HOST, @@ -1368,6 +1381,19 @@ ) both_builders( + "win64_vs2022", + WIN_HOST, + cq_enabled = False, + short_name = "vs22", + properties = { + "msvc_target": "x64", + "gclient_vars": { + "windows_sdk_version": "uploaded:2024-01-11", + }, + }, +) + +both_builders( "win64_rel", WIN_HOST, properties = {
diff --git a/util/audit_symbols.go b/util/audit_symbols.go index fbb67e4..da23462 100644 --- a/util/audit_symbols.go +++ b/util/audit_symbols.go
@@ -87,6 +87,8 @@ regexp.MustCompile(`^snprintf$`), // snprintf() regexp.MustCompile(`^vsnprintf$`), // vsnprintf() regexp.MustCompile(`^\?\?_R[0-4].*$`), // RTTI + regexp.MustCompile(`^_Avx2WmemEnabledWeakValue$`), // MSVC 14.50+ CRT + regexp.MustCompile(`^time$`), // MSVC 14.50+ CRT // Symbols in the FIPS module. // They are provided for tooling only and should not be read internally.
diff --git a/util/bot/DEPS b/util/bot/DEPS index 9c70811..22fcc02 100644 --- a/util/bot/DEPS +++ b/util/bot/DEPS
@@ -45,7 +45,7 @@ 'qemu_static_version': 'version:3@10.0.8+ds-0+deb13u1+b1', # chrome_internal/third_party/sdk/windows, but if an update switches this to a # new major VS release, keep some bots at the older version. - 'windows_sdk_version': 'uploaded:2024-01-11', + 'windows_sdk_version': 'uploaded:2026-05-06', # We test using the latest release of the oldest supported Bazel version # listed in [oss-policies-info]. Browse recent packages in [cipd-bazel] and