Move crashpad to using Mac-13|Mac-14 (like chromium) and latest win sdk

This should give crashpad a newer xcode and msvc that support C++20.

These changes need to land separately from the C++20 usage, as they do
not get applied until after landing, so can't affect the CQ from inside
the CQ.

Bug: 40284755
Change-Id: I3ae72befa008bfb37bac882de0986c5bcf9de079
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/5425460
Commit-Queue: danakj <danakj@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
danakj 2024-04-04 14:12:33 -04:00 committed by Crashpad LUCI CQ
parent 1cea0473a5
commit bbb99bfa37
8 changed files with 27 additions and 27 deletions

View File

@ -2,7 +2,7 @@
# Do not modify manually.
#
# For the schema of this file, see Config message:
# https://luci-config.appspot.com/schemas/projects:commit-queue.cfg
# https://config.luci.app/schemas/projects:commit-queue.cfg
cq_status_host: "chromium-cq-status.appspot.com"
submit_options {

View File

@ -2,7 +2,7 @@
# Do not modify manually.
#
# For the schema of this file, see BuildbucketCfg message:
# https://luci-config.appspot.com/schemas/projects:buildbucket.cfg
# https://config.luci.app/schemas/projects:buildbucket.cfg
buckets {
name: "ci"
@ -156,7 +156,7 @@ buckets {
name: "crashpad_ios_arm64_dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-13|Mac-14"
dimensions: "pool:luci.flex.ci"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@ -193,7 +193,7 @@ buckets {
name: "crashpad_ios_arm64_rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-13|Mac-14"
dimensions: "pool:luci.flex.ci"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@ -230,7 +230,7 @@ buckets {
name: "crashpad_ios_x64_dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-13|Mac-14"
dimensions: "pool:luci.flex.ci"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@ -266,7 +266,7 @@ buckets {
name: "crashpad_ios_x64_rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-13|Mac-14"
dimensions: "pool:luci.flex.ci"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@ -368,7 +368,7 @@ buckets {
name: "crashpad_mac_x64_dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-13|Mac-14"
dimensions: "pool:luci.flex.ci"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@ -404,7 +404,7 @@ buckets {
name: "crashpad_mac_x64_rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-13|Mac-14"
dimensions: "pool:luci.flex.ci"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@ -451,7 +451,7 @@ buckets {
properties:
'{'
' "$depot_tools/windows_sdk": {'
' "version": "uploaded:2021-04-28"'
' "version": "uploaded:2024-01-11"'
' },'
' "$gatekeeper": {'
' "group": "client.crashpad"'
@ -487,7 +487,7 @@ buckets {
properties:
'{'
' "$depot_tools/windows_sdk": {'
' "version": "uploaded:2021-04-28"'
' "version": "uploaded:2024-01-11"'
' },'
' "$gatekeeper": {'
' "group": "client.crashpad"'
@ -658,7 +658,7 @@ buckets {
name: "crashpad_ios_arm64_dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-13|Mac-14"
dimensions: "pool:luci.flex.try"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@ -692,7 +692,7 @@ buckets {
name: "crashpad_ios_arm64_rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-13|Mac-14"
dimensions: "pool:luci.flex.try"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@ -726,7 +726,7 @@ buckets {
name: "crashpad_ios_x64_dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-13|Mac-14"
dimensions: "pool:luci.flex.try"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@ -759,7 +759,7 @@ buckets {
name: "crashpad_ios_x64_rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-13|Mac-14"
dimensions: "pool:luci.flex.try"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@ -852,7 +852,7 @@ buckets {
name: "crashpad_mac_x64_dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-13|Mac-14"
dimensions: "pool:luci.flex.try"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@ -885,7 +885,7 @@ buckets {
name: "crashpad_mac_x64_rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-12"
dimensions: "os:Mac-13|Mac-14"
dimensions: "pool:luci.flex.try"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
@ -929,7 +929,7 @@ buckets {
properties:
'{'
' "$depot_tools/windows_sdk": {'
' "version": "uploaded:2021-04-28"'
' "version": "uploaded:2024-01-11"'
' },'
' "$kitchen": {'
' "devshell": true,'
@ -962,7 +962,7 @@ buckets {
properties:
'{'
' "$depot_tools/windows_sdk": {'
' "version": "uploaded:2021-04-28"'
' "version": "uploaded:2024-01-11"'
' },'
' "$kitchen": {'
' "devshell": true,'

View File

@ -2,7 +2,7 @@
# Do not modify manually.
#
# For the schema of this file, see ProjectConfig message:
# https://luci-config.appspot.com/schemas/projects:luci-logdog.cfg
# https://config.luci.app/schemas/projects:luci-logdog.cfg
reader_auth_groups: "all"
writer_auth_groups: "luci-logdog-chromium-writers"

View File

@ -2,7 +2,7 @@
# Do not modify manually.
#
# For the schema of this file, see Project message:
# https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
# https://config.luci.app/schemas/projects:luci-milo.cfg
consoles {
id: "main"

View File

@ -2,7 +2,7 @@
# Do not modify manually.
#
# For the schema of this file, see ProjectConfig message:
# https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
# https://config.luci.app/schemas/projects:luci-scheduler.cfg
job {
id: "crashpad_fuchsia_arm64_dbg"

View File

@ -2,12 +2,12 @@
# Do not modify manually.
#
# For the schema of this file, see ProjectCfg message:
# https://luci-config.appspot.com/schemas/projects:project.cfg
# https://config.luci.app/schemas/projects:project.cfg
name: "crashpad"
access: "group:all"
lucicfg {
version: "1.32.1"
version: "1.43.5"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"

View File

@ -2,7 +2,7 @@
# Do not modify manually.
#
# For the schema of this file, see RealmsCfg message:
# https://luci-config.appspot.com/schemas/projects:realms.cfg
# https://config.luci.app/schemas/projects:realms.cfg
realms {
name: "@root"

View File

@ -158,11 +158,11 @@ def crashpad_dimensions(platform, bucket):
if platform == "fuchsia":
dimensions["os"] = "Ubuntu-18.04"
elif platform == "ios":
dimensions["os"] = "Mac-12"
dimensions["os"] = "Mac-13|Mac-14"
elif platform == "linux":
dimensions["os"] = "Ubuntu-18.04"
elif platform == "mac":
dimensions["os"] = "Mac-12"
dimensions["os"] = "Mac-13|Mac-14"
elif platform == "win":
dimensions["os"] = "Windows-10"
@ -184,7 +184,7 @@ def crashpad_properties(platform, cpu, config, bucket):
if platform == "win":
properties["$depot_tools/windows_sdk"] = {
"version": "uploaded:2021-04-28",
"version": "uploaded:2024-01-11",
}
if bucket == "ci":