Commit 452aea08 authored by Mike Dougherty's avatar Mike Dougherty Committed by Commit Bot

Roll bots to Xcode 12 beta 2

Bots rolled with the following script:
git grep -l '12a6159' | xargs sed -i '' -e 's/12a6159/12a6163b/g'

to update:
infra/config/lib/builders.star
infra/config/subprojects/chromium/master-only/ci.star
testing/buildbot/mixins.pyl
testing/buildbot/waterfalls.pyl

then configs were generated with:
./infra/config/main.star
./testing/buildbot/generate_buildbot_json.py

CIPD packages:
  infra_internal/ios/xcode/mac  12a6163b
  infra_internal/ios/xcode/ios  12a6163b

Bug: 1102933
Change-Id: I647e328ed6e8b0b7160a930eb97fb98f400944b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2285387
Auto-Submit: Mike Dougherty <michaeldo@chromium.org>
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
Reviewed-by: default avatarStephen Martinis <martiniss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786895}
parent 4b427113
...@@ -10079,11 +10079,11 @@ buckets { ...@@ -10079,11 +10079,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\":\"12a6159\"}" 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\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
caches { caches {
name: "xcode_ios_12a6159" name: "xcode_ios_12a6163b"
path: "xcode_ios_12a6159.app" path: "xcode_ios_12a6163b.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"
...@@ -141,7 +141,7 @@ xcode_cache = struct( ...@@ -141,7 +141,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'),
x11n700h = xcode_enum('xcode_ios_11n700h', 'xcode_ios_11n700h.app'), x11n700h = xcode_enum('xcode_ios_11n700h', 'xcode_ios_11n700h.app'),
# xcode12 # xcode12
x12a6159 = xcode_enum('xcode_ios_12a6159', 'xcode_ios_12a6159.app'), x12a6163b = xcode_enum('xcode_ios_12a6163b', 'xcode_ios_12a6163b.app'),
) )
......
...@@ -1832,11 +1832,11 @@ ci.fyi_ios_builder( ...@@ -1832,11 +1832,11 @@ ci.fyi_ios_builder(
category = 'iOS|iOS14', category = 'iOS|iOS14',
short_name = 'sdk14', short_name = 'sdk14',
), ),
caches = [xcode_cache.x12a6159], caches = [xcode_cache.x12a6163b],
executable = 'recipe:chromium', executable = 'recipe:chromium',
os = os.MAC_10_15, os = os.MAC_10_15,
properties = { properties = {
'xcode_build_version': '12a6159' 'xcode_build_version': '12a6163b'
} }
) )
......
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.
...@@ -932,17 +932,17 @@ ...@@ -932,17 +932,17 @@
}, },
}, },
# xcode 12 # xcode 12
'xcode_12a6159': { 'xcode_12a6163b': {
'$mixin_append': { '$mixin_append': {
'args': [ 'args': [
'--xcode-build-version', '--xcode-build-version',
'12a6159' '12a6163b'
], ],
}, },
'swarming': { 'swarming': {
'named_caches': [ 'named_caches': [
{ {
'name': 'xcode_ios_12a6159', 'name': 'xcode_ios_12a6163b',
'path': 'Xcode.app', 'path': 'Xcode.app',
}, },
], ],
......
...@@ -2094,7 +2094,7 @@ ...@@ -2094,7 +2094,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a6159', 'xcode_12a6163b',
], ],
'test_suites': { 'test_suites': {
'isolated_scripts': 'ios14_beta_simulator_tests' 'isolated_scripts': 'ios14_beta_simulator_tests'
...@@ -2110,7 +2110,7 @@ ...@@ -2110,7 +2110,7 @@
'mac_10.15', 'mac_10.15',
'mac_toolchain', 'mac_toolchain',
'out_dir_arg', 'out_dir_arg',
'xcode_12a6159', 'xcode_12a6163b',
], ],
'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