From 0e193ac03e9f3765973488b3a8838387ac614917 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Thu, 30 Sep 2021 18:08:40 +0000 Subject: [PATCH] Unpin OSX SDK version being used This is no longer needed, and removing will avoid the possibility of needing reinstall XCode on every CQ run. Change-Id: I29fa99734ec71349102d19fd77f9e416db8979d3 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/65300 Kokoro: Kokoro Commit-Queue: Ryan Harrison Auto-Submit: Ryan Harrison Reviewed-by: David Neto Reviewed-by: Ben Clayton --- infra/config/global/generated/cr-buildbucket.cfg | 4 ---- infra/config/global/main.star | 5 ----- 2 files changed, 9 deletions(-) diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg index 26e967f846..9929bd0c2f 100644 --- a/infra/config/global/generated/cr-buildbucket.cfg +++ b/infra/config/global/generated/cr-buildbucket.cfg @@ -105,7 +105,6 @@ buckets { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/master" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" - properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"11b52\"}" properties_j: "clang:true" properties_j: "debug:true" properties_j: "target_cpu:\"x64\"" @@ -131,7 +130,6 @@ buckets { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/master" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" - properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"11b52\"}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "target_cpu:\"x64\"" @@ -402,7 +400,6 @@ buckets { cipd_version: "refs/heads/master" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" - properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"11b52\"}" properties_j: "clang:true" properties_j: "debug:true" properties_j: "target_cpu:\"x64\"" @@ -429,7 +426,6 @@ buckets { cipd_version: "refs/heads/master" properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}" properties_j: "$depot_tools/bot_update:{\"apply_patch_on_gclient\":true}" - properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"11b52\"}" properties_j: "clang:true" properties_j: "debug:false" properties_j: "target_cpu:\"x64\"" diff --git a/infra/config/global/main.star b/infra/config/global/main.star index 768ec705ca..faa43d41c0 100755 --- a/infra/config/global/main.star +++ b/infra/config/global/main.star @@ -193,11 +193,6 @@ def get_default_properties(os, clang, debug, cpu): goma_props["enable_ats"] = True properties["$build/goma"] = goma_props - if os.category == os_category.MAC: - properties["$depot_tools/osx_sdk"] = { - "sdk_version": "11b52", - } - return properties def add_ci_builder(name, os, clang, debug, cpu):