Commit 966faed9 authored by Jeff Yoon's avatar Jeff Yoon Committed by Commit Bot

[ios] ios14 roll to xcode 12 beta 5 12a8189h

* upstream ios14-sdk compile and test with xc12b5
* upstrema ios14-beta compile n-1 and test w/ xc12b5
* upstream ios14-sdk trybot cache update to xc12b5

Bug: 1118191
Change-Id: I6d6e36c17a20e6a4bd684377aa6a396927ec8036
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363706Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799706}
parent 43d7cedb
...@@ -10105,11 +10105,11 @@ buckets { ...@@ -10105,11 +10105,11 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"mastername\":\"chromium.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12a8179i_audio\"}" properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"mastername\":\"chromium.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12a8189h\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
caches { caches {
name: "xcode_ios_12a8179i_audio" name: "xcode_ios_12a8189h"
path: "xcode_ios_12a8179i_audio.app" path: "xcode_ios_12a8189h.app"
} }
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -24492,8 +24492,8 @@ buckets { ...@@ -24492,8 +24492,8 @@ buckets {
path: "win_toolchain" path: "win_toolchain"
} }
caches { caches {
name: "xcode_ios_12a8179i_audio" name: "xcode_ios_12a8189h"
path: "xcode_ios_12a8179i_audio.app" path: "xcode_ios_12a8189h.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"
...@@ -133,8 +133,8 @@ xcode_cache = struct( ...@@ -133,8 +133,8 @@ xcode_cache = struct(
x11e608cwk = xcode_enum("xcode_ios_11e608cwk", "xcode_ios_11e608cwk.app"), x11e608cwk = xcode_enum("xcode_ios_11e608cwk", "xcode_ios_11e608cwk.app"),
x11e503a_xct12b1 = xcode_enum("xcode_ios_11e503a_xct12b1", "xcode_ios_11e503a_xct12b1.app"), x11e503a_xct12b1 = xcode_enum("xcode_ios_11e503a_xct12b1", "xcode_ios_11e503a_xct12b1.app"),
x11e708 = xcode_enum("xcode_ios_11e708", "xcode_ios_11e708.app"), x11e708 = xcode_enum("xcode_ios_11e708", "xcode_ios_11e708.app"),
# xcode12 # xc12 beta 5
x12a8179i_audio = xcode_enum("xcode_ios_12a8179i_audio", "xcode_ios_12a8179i_audio.app"), x12a8189h = xcode_enum("xcode_ios_12a8189h", "xcode_ios_12a8189h.app"),
) )
################################################################################ ################################################################################
......
...@@ -1910,11 +1910,11 @@ ci.fyi_ios_builder( ...@@ -1910,11 +1910,11 @@ ci.fyi_ios_builder(
category = "iOS|iOS14", category = "iOS|iOS14",
short_name = "sdk14", short_name = "sdk14",
), ),
caches = [xcode_cache.x12a8179i_audio], caches = [xcode_cache.x12a8189h],
executable = "recipe:chromium", executable = "recipe:chromium",
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
"xcode_build_version": "12a8179i_audio", "xcode_build_version": "12a8189h",
}, },
) )
......
...@@ -645,7 +645,7 @@ try_.chromium_mac_ios_builder( ...@@ -645,7 +645,7 @@ try_.chromium_mac_ios_builder(
try_.chromium_mac_ios_builder( try_.chromium_mac_ios_builder(
name = "ios14-sdk-simulator", name = "ios14-sdk-simulator",
executable = "recipe:chromium_trybot", executable = "recipe:chromium_trybot",
caches = [xcode_cache.x12a8179i_audio], caches = [xcode_cache.x12a8189h],
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
"xcode_build_version": "12a8179i_audio", "xcode_build_version": "12a8179i_audio",
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -962,18 +962,18 @@ ...@@ -962,18 +962,18 @@
], ],
}, },
}, },
# xcode 12 beta 4 # xcode 12 beta 5
'xcode_12a8179i_audio': { 'xcode_12a8189h': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': [
'--xcode-build-version', '--xcode-build-version',
'12a8179i_audio' '12a8189h'
], ],
}, },
'swarming': { 'swarming': {
'named_caches': [ 'named_caches': [
{ {
'name': 'xcode_ios_12a8179i_audio', 'name': 'xcode_ios_12a8189h',
'path': 'Xcode.app', 'path': 'Xcode.app',
}, },
], ],
......
...@@ -2147,7 +2147,7 @@ ...@@ -2147,7 +2147,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a8179i_audio', 'xcode_12a8189h',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios14_beta_simulator_tests' 'isolated_scripts': 'ios14_beta_simulator_tests'
...@@ -2164,7 +2164,7 @@ ...@@ -2164,7 +2164,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a8179i_audio', 'xcode_12a8189h',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios14_sdk_simulator_tests' 'isolated_scripts': 'ios14_sdk_simulator_tests'
......
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