Skip to content

A
angle
Commit 12342643 by Jamie Madill Committed by Commit Bot
Options

infra: Remove osx_sdk cache.

This is no longer necessary now that we use mac_toolchain.py. Bug: angleproject:5114 Change-Id: I0afac641d55e9be2bd04103301aec3080d3332c8 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2823859Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 9e1ccb24
Showing with 4 additions and 30 deletions
infra/config/generated/cr-buildbucket.cfg
......@@ -97,11 +97,7 @@ buckets {
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"12D4e\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
caches {
name: "osx_sdk"
path: "osx_sdk"
}
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
......@@ -114,11 +110,7 @@ buckets {
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"12D4e\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
caches {
name: "osx_sdk"
path: "osx_sdk"
}
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
......@@ -371,11 +363,7 @@ buckets {
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"12D4e\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
caches {
name: "osx_sdk"
path: "osx_sdk"
}
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
......@@ -388,11 +376,7 @@ buckets {
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"12D4e\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
caches {
name: "osx_sdk"
path: "osx_sdk"
}
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
......
infra/config/main.star
......@@ -133,14 +133,6 @@ def angle_standalone_builder(name, clang, debug, cpu, uwp = False, trace_tests =
properties["$build/goma"] = goma_props
caches = []
if os.category == os_category.MAC:
# Cache for mac_toolchain tool and XCode.app
caches += [swarming.cache(name = "osx_sdk", path = "osx_sdk")]
properties["$depot_tools/osx_sdk"] = {
"sdk_version": "12D4e"
}
if not clang:
properties["clang"] = False
......@@ -155,7 +147,6 @@ def angle_standalone_builder(name, clang, debug, cpu, uwp = False, trace_tests =
service_account = "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
properties = properties,
dimensions = dimensions,
caches = caches,
build_numbers = True,
)
......@@ -166,7 +157,6 @@ def angle_standalone_builder(name, clang, debug, cpu, uwp = False, trace_tests =
service_account = "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com",
properties = properties,
dimensions = dimensions,
caches = caches,
build_numbers = True,
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment