Commit a0fb5045 authored by Jeff Yoon's avatar Jeff Yoon Committed by Commit Bot

use calculated xcode version for mac_upload_clang

mac_upload_clang had set static version of xcode to use. This
change removes these static properties such that it uses a version
of xcode calculated from the OS in the osx_sdk recipe module.

Bug: 1137520
Change-Id: Ia184c03abad326656989402655645938437d37e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2468236
Commit-Queue: Jeff Yoon <jeffyoon@chromium.org>
Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816614}
parent 42bb0ac1
...@@ -27946,17 +27946,13 @@ buckets { ...@@ -27946,17 +27946,13 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"9a235\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_upload_clang\"}" properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_upload_clang\"}"
execution_timeout_secs: 21600 execution_timeout_secs: 21600
expiration_secs: 7200 expiration_secs: 7200
caches { caches {
name: "win_toolchain" name: "win_toolchain"
path: "win_toolchain" path: "win_toolchain"
} }
caches {
name: "xcode_mac_9a235"
path: "xcode_mac_9a235.app"
}
build_numbers: YES build_numbers: YES
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage { task_template_canary_percentage {
...@@ -1198,20 +1198,9 @@ try_.chromium_mac_builder( ...@@ -1198,20 +1198,9 @@ try_.chromium_mac_builder(
try_.chromium_mac_builder( try_.chromium_mac_builder(
name = "mac_upload_clang", name = "mac_upload_clang",
builderless = False, builderless = False,
caches = [
swarming.cache(
name = "xcode_mac_9a235",
path = "xcode_mac_9a235.app",
),
],
executable = "recipe:chromium_upload_clang", executable = "recipe:chromium_upload_clang",
execution_timeout = 6 * time.hour, execution_timeout = 6 * time.hour,
goma_backend = None, # Does not use Goma. goma_backend = None, # Does not use Goma.
properties = {
"$depot_tools/osx_sdk": {
"sdk_version": "9a235",
},
},
) )
try_.chromium_mac_ios_builder( try_.chromium_mac_ios_builder(
......
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