Upgrade iOS bots to xcode 13.

Also update ios 14.0 simulators to 14.5 because tests were failing.

Change-Id: I36c946ff26899502ad611d3f473f3692374b08a4
Bug: b/228171822
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264830
Reviewed-by: Christoffer Jansson <jansson@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#37103}
This commit is contained in:
Jeremy Leconte 2022-06-02 16:57:13 +02:00 committed by WebRTC LUCI CQ
parent 18b82e22ee
commit 33e5873712
5 changed files with 296 additions and 800 deletions

File diff suppressed because it is too large Load Diff

View File

@ -113,13 +113,13 @@
}
}
},
'ios-simulator-14.0': {
'ios-simulator-14.5': {
'$mixin_append': {
'args': ['--platform', 'iPhone X', '--version', '14.0'],
'args': ['--platform', 'iPhone X', '--version', '14.5'],
'swarming': {
'named_caches': [{
'name': 'runtime_ios_14_0',
'path': 'Runtime-ios-14.0'
'name': 'runtime_ios_14_5',
'path': 'Runtime-ios-14.5'
}]
}
}
@ -336,17 +336,6 @@
}
}
},
'xcode_12a7209': {
'$mixin_append': {
'args': ['--xcode-build-version', '12a7209'],
'swarming': {
'named_caches': [{
'name': 'xcode_ios_12a7209',
'path': 'Xcode.app'
}]
}
}
},
'xcode_12d4e': {
'$mixin_append': {
'args': ['--xcode-build-version', '12d4e'],

View File

@ -89,19 +89,19 @@
},
}
},
'ios-simulator-14.0': {
'ios-simulator-14.5': {
'$mixin_append': {
'args': [
'--platform',
'iPhone X',
'--version',
'14.0',
'14.5',
],
'swarming': {
'named_caches': [
{
'name': 'runtime_ios_14_0',
'path': 'Runtime-ios-14.0',
'name': 'runtime_ios_14_5',
'path': 'Runtime-ios-14.5',
},
],
},
@ -260,17 +260,4 @@
},
},
},
'xcode_12a7209': {
'$mixin_append': {
'args': ['--xcode-build-version', '12a7209'],
'swarming': {
'named_caches': [
{
'name': 'xcode_ios_12a7209',
'path': 'Xcode.app',
},
],
},
},
},
}

File diff suppressed because it is too large Load Diff

View File

@ -203,7 +203,7 @@
'iOS64 Sim Debug (iOS 12)': {
'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-12.4',
'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
],
'test_suites': {
@ -213,7 +213,7 @@
'iOS64 Sim Debug (iOS 13)': {
'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-13.6',
'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
],
'test_suites': {
@ -222,8 +222,8 @@
},
'iOS64 Sim Debug (iOS 14.0)': {
'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-14.0',
'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
'mac11', 'chromium-tester-service-account', 'ios-simulator-14.5',
'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
],
'test_suites': {
@ -421,7 +421,7 @@
'ios_sim_x64_dbg_ios12': {
'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-12.4',
'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
],
'test_suites': {
@ -431,7 +431,7 @@
'ios_sim_x64_dbg_ios13': {
'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-13.6',
'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
],
'test_suites': {
@ -440,8 +440,8 @@
},
'ios_sim_x64_dbg_ios14': {
'mixins': [
'mac11', 'chromium-tester-service-account', 'ios-simulator-14.0',
'xcode_12a7209', 'mac_toolchain', 'has_native_resultdb_integration',
'mac11', 'chromium-tester-service-account', 'ios-simulator-14.5',
'xcode_13_main', 'mac_toolchain', 'has_native_resultdb_integration',
'out_dir_arg'
],
'test_suites': {