Commit 17506884 authored by Justin Cohen's avatar Justin Cohen Committed by Commit Bot

[ios] Upstream roll Xcode 12 beta 4 (with audio workaround)

* roll ios14-sdk-simulator to build with 12a8179i_audio
* ios14-beta and ios14-sdk to run tests with 12a8179i_audio

git grep -l '12a6163b' | xargs sed -i '' -e 's/12a6163b/12a8179i_audio/g'

Tested with:
  led get-builder luci.chromium.try:ios14-sdk-simulator | \
  led edit -p 'xcode_build_version="12a8179i_audio"' | \
  led edit-cr-cl http://crrev.com/c/2340705 | \
  led launch

Bug: 1112941
Change-Id: I64c0beea00c554aa7c1c8cfa2b33383cd3e11493
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2340705Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795634}
parent 1ebe9b3e
...@@ -10135,11 +10135,11 @@ buckets { ...@@ -10135,11 +10135,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\":\"12a6163b\"}" 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\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
caches { caches {
name: "xcode_ios_12a6163b" name: "xcode_ios_12a8179i_audio"
path: "xcode_ios_12a6163b.app" path: "xcode_ios_12a8179i_audio.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"
...@@ -24518,7 +24518,7 @@ buckets { ...@@ -24518,7 +24518,7 @@ 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\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\",\"xcode_build_version\":\"12a6163b\"}" properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"mastername\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\",\"xcode_build_version\":\"12a8179i_audio\"}"
execution_timeout_secs: 14400 execution_timeout_secs: 14400
expiration_secs: 7200 expiration_secs: 7200
caches { caches {
...@@ -24526,8 +24526,8 @@ buckets { ...@@ -24526,8 +24526,8 @@ buckets {
path: "win_toolchain" path: "win_toolchain"
} }
caches { caches {
name: "xcode_ios_12a6163b" name: "xcode_ios_12a8179i_audio"
path: "xcode_ios_12a6163b.app" path: "xcode_ios_12a8179i_audio.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,7 +133,7 @@ xcode_cache = struct( ...@@ -133,7 +133,7 @@ xcode_cache = struct(
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 # xcode12
x12a6163b = xcode_enum("xcode_ios_12a6163b", "xcode_ios_12a6163b.app"), x12a8179i_audio = xcode_enum("xcode_ios_12a8179i_audio", "xcode_ios_12a8179i_audio.app"),
) )
################################################################################ ################################################################################
......
...@@ -1888,11 +1888,11 @@ ci.fyi_ios_builder( ...@@ -1888,11 +1888,11 @@ ci.fyi_ios_builder(
category = "iOS|iOS14", category = "iOS|iOS14",
short_name = "sdk14", short_name = "sdk14",
), ),
caches = [xcode_cache.x12a6163b], caches = [xcode_cache.x12a8179i_audio],
executable = "recipe:chromium", executable = "recipe:chromium",
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
"xcode_build_version": "12a6163b", "xcode_build_version": "12a8179i_audio",
}, },
) )
......
...@@ -648,10 +648,10 @@ try_.chromium_mac_ios_builder( ...@@ -648,10 +648,10 @@ 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.x12a6163b], caches = [xcode_cache.x12a8179i_audio],
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
"xcode_build_version": "12a6163b", "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.
...@@ -960,18 +960,18 @@ ...@@ -960,18 +960,18 @@
], ],
}, },
}, },
# xcode 12 # xcode 12 beta 4
'xcode_12a6163b': { 'xcode_12a8179i_audio': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': [
'--xcode-build-version', '--xcode-build-version',
'12a6163b' '12a8179i_audio'
], ],
}, },
'swarming': { 'swarming': {
'named_caches': [ 'named_caches': [
{ {
'name': 'xcode_ios_12a6163b', 'name': 'xcode_ios_12a8179i_audio',
'path': 'Xcode.app', 'path': 'Xcode.app',
}, },
], ],
......
...@@ -2143,7 +2143,7 @@ ...@@ -2143,7 +2143,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a6163b', 'xcode_12a8179i_audio',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios14_beta_simulator_tests' 'isolated_scripts': 'ios14_beta_simulator_tests'
...@@ -2160,7 +2160,7 @@ ...@@ -2160,7 +2160,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a6163b', 'xcode_12a8179i_audio',
], ],
'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