From 197d037cfd2af493e93ac6d661f50a179416cac0 Mon Sep 17 00:00:00 2001 From: Alex Gough Date: Thu, 4 Nov 2021 23:40:05 +0000 Subject: [PATCH] Revert "Reland "Bump Windows SDK to 10.0.19041.0"" Infra failures continue: https://ci.chromium.org/ui/p/crashpad/builders/try/crashpad_win_x64_rel/114/overview This reverts commit 44f566832da48b25c09ee83d4221a9c57f359a82. Reason for revert: Original change's description: > Reland "Bump Windows SDK to 10.0.19041.0" > > This is a reland of 020da53ac84de675c8adae5b512f4257adc9dfe3 > > Original change's description: > > Bump Windows SDK to 10.0.19041.0 > > > > Change-Id: Id0c308a838a8b94ce7d24369ffd168a10730a30a > > Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3256822 > > Reviewed-by: Mark Mentovai > > Commit-Queue: Mark Mentovai > > Change-Id: I9e8d14415c12c28b6a230b689d3b791a086d7a06 > Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3260604 > Commit-Queue: Alex Gough > Reviewed-by: Mark Mentovai Change-Id: I4b0629bccdb7586146f1775d20bfdc7d66348d2c No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3260756 Bot-Commit: Rubber Stamper Reviewed-by: Mark Mentovai Commit-Queue: Alex Gough --- DEPS | 2 +- infra/config/generated/cr-buildbucket.cfg | 20 -------------------- infra/config/main.star | 7 ------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/DEPS b/DEPS index 8a6ee243..8ecd52e3 100644 --- a/DEPS +++ b/DEPS @@ -106,7 +106,7 @@ deps = { 'packages': [ { 'package': 'chrome_internal/third_party/sdk/windows', - 'version': 'uploaded:2021-04-28' + 'version': 'uploaded:2018-06-13' }, ], 'condition': 'checkout_win and pull_win_toolchain', diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 0eb8c621..d34621cd 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg @@ -450,11 +450,6 @@ buckets { } properties: '{' - ' "$depot_tools/windows_sdk": {' - ' "sdk_properties": {' - ' "version": "uploaded:2021-04-28"' - ' }' - ' },' ' "$gatekeeper": {' ' "group": "client.crashpad"' ' },' @@ -488,11 +483,6 @@ buckets { } properties: '{' - ' "$depot_tools/windows_sdk": {' - ' "sdk_properties": {' - ' "version": "uploaded:2021-04-28"' - ' }' - ' },' ' "$gatekeeper": {' ' "group": "client.crashpad"' ' },' @@ -932,11 +922,6 @@ buckets { } properties: '{' - ' "$depot_tools/windows_sdk": {' - ' "sdk_properties": {' - ' "version": "uploaded:2021-04-28"' - ' }' - ' },' ' "$kitchen": {' ' "devshell": true,' ' "git_auth": true' @@ -967,11 +952,6 @@ buckets { } properties: '{' - ' "$depot_tools/windows_sdk": {' - ' "sdk_properties": {' - ' "version": "uploaded:2021-04-28"' - ' }' - ' },' ' "$kitchen": {' ' "devshell": true,' ' "git_auth": true' diff --git a/infra/config/main.star b/infra/config/main.star index 94f06210..f51ef23e 100755 --- a/infra/config/main.star +++ b/infra/config/main.star @@ -183,13 +183,6 @@ 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",