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 <noreply+kokoro@google.com> Commit-Queue: Ryan Harrison <rharrison@chromium.org> Auto-Submit: Ryan Harrison <rharrison@chromium.org> Reviewed-by: David Neto <dneto@google.com> Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
parent
ee23c17345
commit
0e193ac03e
|
@ -105,7 +105,6 @@ buckets {
|
||||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||||
cipd_version: "refs/heads/master"
|
cipd_version: "refs/heads/master"
|
||||||
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
|
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: "clang:true"
|
||||||
properties_j: "debug:true"
|
properties_j: "debug:true"
|
||||||
properties_j: "target_cpu:\"x64\""
|
properties_j: "target_cpu:\"x64\""
|
||||||
|
@ -131,7 +130,6 @@ buckets {
|
||||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||||
cipd_version: "refs/heads/master"
|
cipd_version: "refs/heads/master"
|
||||||
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
|
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: "clang:true"
|
||||||
properties_j: "debug:false"
|
properties_j: "debug:false"
|
||||||
properties_j: "target_cpu:\"x64\""
|
properties_j: "target_cpu:\"x64\""
|
||||||
|
@ -402,7 +400,6 @@ buckets {
|
||||||
cipd_version: "refs/heads/master"
|
cipd_version: "refs/heads/master"
|
||||||
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
|
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/bot_update:{\"apply_patch_on_gclient\":true}"
|
||||||
properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"11b52\"}"
|
|
||||||
properties_j: "clang:true"
|
properties_j: "clang:true"
|
||||||
properties_j: "debug:true"
|
properties_j: "debug:true"
|
||||||
properties_j: "target_cpu:\"x64\""
|
properties_j: "target_cpu:\"x64\""
|
||||||
|
@ -429,7 +426,6 @@ buckets {
|
||||||
cipd_version: "refs/heads/master"
|
cipd_version: "refs/heads/master"
|
||||||
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
|
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/bot_update:{\"apply_patch_on_gclient\":true}"
|
||||||
properties_j: "$depot_tools/osx_sdk:{\"sdk_version\":\"11b52\"}"
|
|
||||||
properties_j: "clang:true"
|
properties_j: "clang:true"
|
||||||
properties_j: "debug:false"
|
properties_j: "debug:false"
|
||||||
properties_j: "target_cpu:\"x64\""
|
properties_j: "target_cpu:\"x64\""
|
||||||
|
|
|
@ -193,11 +193,6 @@ def get_default_properties(os, clang, debug, cpu):
|
||||||
goma_props["enable_ats"] = True
|
goma_props["enable_ats"] = True
|
||||||
properties["$build/goma"] = goma_props
|
properties["$build/goma"] = goma_props
|
||||||
|
|
||||||
if os.category == os_category.MAC:
|
|
||||||
properties["$depot_tools/osx_sdk"] = {
|
|
||||||
"sdk_version": "11b52",
|
|
||||||
}
|
|
||||||
|
|
||||||
return properties
|
return properties
|
||||||
|
|
||||||
def add_ci_builder(name, os, clang, debug, cpu):
|
def add_ci_builder(name, os, clang, debug, cpu):
|
||||||
|
|
Loading…
Reference in New Issue