diff --git a/DEPS b/DEPS index 8ecd52e3..8a6ee243 100644 --- a/DEPS +++ b/DEPS @@ -106,7 +106,7 @@ deps = { 'packages': [ { 'package': 'chrome_internal/third_party/sdk/windows', - 'version': 'uploaded:2018-06-13' + 'version': 'uploaded:2021-04-28' }, ], 'condition': 'checkout_win and pull_win_toolchain', diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 66c5e375..bf9f5e3d 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg @@ -387,6 +387,7 @@ buckets { name: "crashpad/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" + properties_j: "$depot_tools/windows_sdk:{\"sdk_properties\":{\"version\":\"uploaded:2021-04-28\"}}" properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "config:\"Debug\"" @@ -415,6 +416,7 @@ buckets { name: "crashpad/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" + properties_j: "$depot_tools/windows_sdk:{\"sdk_properties\":{\"version\":\"uploaded:2021-04-28\"}}" properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "config:\"Release\"" @@ -813,6 +815,7 @@ buckets { name: "crashpad/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" + properties_j: "$depot_tools/windows_sdk:{\"sdk_properties\":{\"version\":\"uploaded:2021-04-28\"}}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "config:\"Debug\"" properties_j: "target_os:\"win\"" @@ -840,6 +843,7 @@ buckets { name: "crashpad/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" + properties_j: "$depot_tools/windows_sdk:{\"sdk_properties\":{\"version\":\"uploaded:2021-04-28\"}}" properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" properties_j: "config:\"Release\"" properties_j: "target_os:\"win\"" diff --git a/infra/config/main.star b/infra/config/main.star index 965b18af..0ef18f8f 100755 --- a/infra/config/main.star +++ b/infra/config/main.star @@ -186,6 +186,13 @@ def crashpad_properties(platform, cpu, config, bucket): if cpu != "x64": properties["target_cpu"] = cpu + if platform == "win": + properties["$depot_tools/windows_sdk"] = { + "sdk_properties": { + "version": "uploaded:2021-04-28", + }, + } + if bucket == "ci": properties["$gatekeeper"] = { "group": "client.crashpad",