Commit 15819f84 authored by Zhaoyang Li's avatar Zhaoyang Li Committed by Commit Bot

[iOS][infra] Roll beta bots to Xcode 12.2 beta 2.

git grep -l '12b5018i' | xargs sed -i '' -e 's/12b5018i/12b5025f/g'
Changed a comment line from specific version to "latest beta version"

Bug: 1134473
Change-Id: I34ed2eeb966bbf1d0be482997d5c6408b83b4651
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2459054Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814944}
parent 085a7f28
......@@ -11250,11 +11250,11 @@ buckets {
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12b5018i\"}"
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12b5025f\"}"
execution_timeout_secs: 36000
caches {
name: "xcode_ios_12b5018i"
path: "xcode_ios_12b5018i.app"
name: "xcode_ios_12b5025f"
path: "xcode_ios_12b5025f.app"
}
build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
......@@ -21405,7 +21405,7 @@ buckets {
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"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_trybot\",\"xcode_build_version\":\"12b5018i\"}"
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"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_trybot\",\"xcode_build_version\":\"12b5025f\"}"
execution_timeout_secs: 14400
expiration_secs: 7200
caches {
......@@ -21413,8 +21413,8 @@ buckets {
path: "win_toolchain"
}
caches {
name: "xcode_ios_12b5018i"
path: "xcode_ios_12b5018i.app"
name: "xcode_ios_12b5025f"
path: "xcode_ios_12b5025f.app"
}
build_numbers: YES
service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
......@@ -137,8 +137,8 @@ xcode_cache = struct(
x11e608cwk = xcode_enum("xcode_ios_11e608cwk", "xcode_ios_11e608cwk.app"),
# (current default) xc12 gm seed
x12a7209 = xcode_enum("xcode_ios_12a7209", "xcode_ios_12a7209.app"),
# Xcode 12.2 beta 1
x12b5018i = xcode_enum("xcode_ios_12b5018i", "xcode_ios_12b5018i.app"),
# latest Xcode 12 beta version.
x12b5025f = xcode_enum("xcode_ios_12b5025f", "xcode_ios_12b5025f.app"),
)
################################################################################
......
......@@ -2835,9 +2835,9 @@ ci.fyi_ios_builder(
category = "iOS|iOS14",
short_name = "sdk14",
),
caches = [xcode_cache.x12b5018i],
caches = [xcode_cache.x12b5025f],
properties = {
"xcode_build_version": "12b5018i",
"xcode_build_version": "12b5025f",
},
)
......
......@@ -1290,9 +1290,9 @@ try_.chromium_mac_ios_builder(
try_.chromium_mac_ios_builder(
name = "ios14-sdk-simulator",
caches = [xcode_cache.x12b5018i],
caches = [xcode_cache.x12b5025f],
properties = {
"xcode_build_version": "12b5018i",
"xcode_build_version": "12b5025f",
},
)
......
This diff is collapsed.
......@@ -990,17 +990,17 @@
},
},
# latest Xcode 12 beta version.
'xcode_12b5018i': {
'xcode_12b5025f': {
'$mixin_append': {
'args': [
'--xcode-build-version',
'12b5018i'
'12b5025f'
],
},
'swarming': {
'named_caches': [
{
'name': 'xcode_ios_12b5018i',
'name': 'xcode_ios_12b5025f',
'path': 'Xcode.app',
},
],
......
......@@ -2338,7 +2338,7 @@
'mac_10.15',
'mac_toolchain',
'out_dir_arg',
'xcode_12b5018i',
'xcode_12b5025f',
'xctest',
],
'test_suites': {
......@@ -2355,7 +2355,7 @@
'mac_10.15',
'mac_toolchain',
'out_dir_arg',
'xcode_12b5018i',
'xcode_12b5025f',
'xctest',
],
'test_suites': {
......
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