Skip to content

GitLab

T
tangled
Commit be36e3f4 authored by Justin Cohen's avatar Justin Cohen Committed by Commit Bot
Browse files
Options

[ios] Roll upstream iOS FYI builders to Xcode 10 beta 6. 

CIPD packages:
  infra_internal/ios/xcode/mac  10l232m
  infra_internal/ios/xcode/ios  10l232m

Also fixes the LUCI buildbucket caches for Xcode 10.

Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I30453ed7b40c86547ed34ff0bc9fd6d53a2a5127
Reviewed-on: https://chromium-review.googlesource.com/1177916Reviewed-by: default avatarSergey Berezin <sergeyberezin@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarRohit Rao <rohitrao@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584177}
parent a3d36e9f
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
infra/config/global/cr-buildbucket.cfg
View file @ be36e3f4
......@@ -389,18 +389,18 @@ builder_mixins {
builder_mixins {
name: "xcode-caches"
caches: {
# Cache for Xcode 9.2 (build version 9C40b) needed for iOS builds.
name: "xcode_ios_9c40b"
path: "xcode_ios_9c40b.app"
# Cache for Xcode 10.0 beta 5 (build version 10l221o) needed for iOS builds.
name: "xcode_ios_10l221o"
path: "xcode_ios_10l221o.app"
}
}
builder_mixins {
name: "xcode-10-caches"
name: "xcode-10-try-caches"
caches: {
# Cache for Xcode 10.0 beta 5 (build version 10l221o) needed for iOS builds.
name: "xcode_ios_10l221o"
path: "xcode_ios_10l221o.app"
# Cache for Xcode 10.0 beta 6 (build version 10l232m) needed for iOS builds.
name: "xcode_ios_10l232m"
path: "xcode_ios_10l221m.app"
}
}
......@@ -1355,9 +1355,9 @@ buckets {
builders { mixins: "ios-ci" name: "ios-simulator-xcode-clang" }
builders { mixins: "ios-ci" name: "ios-uirefresh-simulator" }
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios-simulator-cronet" }
builders { mixins: "ios-ci" mixins: "fyi-ci" mixins: "xcode-10-caches" name: "ios12-sdk-device" }
builders { mixins: "ios-ci" mixins: "fyi-ci" mixins: "xcode-10-caches" name: "ios12-sdk-simulator" }
builders { mixins: "ios-ci" mixins: "fyi-ci" mixins: "xcode-10-caches" name: "ios12-sdk-xcode-clang" }
builders { mixins: "ios-ci" mixins: "fyi-ci" mixins: "xcode-10-try-caches" name: "ios12-sdk-device" }
builders { mixins: "ios-ci" mixins: "fyi-ci" mixins: "xcode-10-try-caches" name: "ios12-sdk-simulator" }
builders { mixins: "ios-ci" mixins: "fyi-ci" mixins: "xcode-10-try-caches" name: "ios12-sdk-xcode-clang" }
# Win bots.
builders {
......@@ -2618,7 +2618,7 @@ buckets {
builders { mixins: "ios-try" name: "ios-simulator" }
builders { mixins: "ios-try" name: "ios-simulator-cronet" }
builders { mixins: "ios-try" name: "ios-uirefresh-simulator" }
builders { mixins: "ios-try" mixins: "xcode-10-caches" name: "ios12-sdk-simulator" }
builders { mixins: "ios-try" mixins: "xcode-10-try-caches" name: "ios12-sdk-simulator" }
builders { mixins: "ios-try" name: "ios-simulator-full-configs" }
builders { mixins: "ios-try" name: "ios-simulator-eg" }
builders { mixins: "ios-try" name: "ios-simulator-xcode-clang" }
......
ios/build/bots/chromium.fyi/ios12-beta-simulator.json
View file @ be36e3f4
......@@ -19,7 +19,7 @@
"include": "common_tests.json",
"device type": "iPhone X",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......@@ -30,7 +30,7 @@
"include": "eg_cq_tests.json",
"device type": "iPhone X",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......@@ -41,7 +41,7 @@
"include": "eg_cq_tests.json",
"device type": "iPhone 6 Plus",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......@@ -52,7 +52,7 @@
"include": "eg_cq_tests.json",
"device type": "iPhone 5s",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......@@ -63,7 +63,7 @@
"include": "eg_cq_tests.json",
"device type": "iPad Pro",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......@@ -74,7 +74,7 @@
"include": "eg_tests.json",
"device type": "iPhone X",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......@@ -85,7 +85,7 @@
"include": "eg_tests.json",
"device type": "iPhone 6 Plus",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......@@ -96,7 +96,7 @@
"include": "eg_tests.json",
"device type": "iPad Air",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......@@ -107,7 +107,7 @@
"include": "eg_tests.json",
"device type": "iPhone 5s",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......@@ -118,7 +118,7 @@
"include": "screen_size_dependent_tests.json",
"device type": "iPhone 6s Plus",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......@@ -129,7 +129,7 @@
"include": "screen_size_dependent_tests.json",
"device type": "iPhone X",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......@@ -140,7 +140,7 @@
"include": "screen_size_dependent_tests.json",
"device type": "iPhone 5s",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......@@ -151,7 +151,7 @@
"include": "screen_size_dependent_tests.json",
"device type": "iPad Air 2",
"os": "12.0",
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
......
ios/build/bots/chromium.fyi/ios12-sdk-device.json
View file @ be36e3f4
......@@ -4,7 +4,7 @@
"Build is performed with gn+ninja.",
"If modified, please change chromium.fyi/ios-device-goma-canary-clobber.json too."
],
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"gn_args": [
"additional_target_cpus=[ \"arm64\" ]",
"goma_dir=\"$(goma_dir)\"",
......
ios/build/bots/chromium.fyi/ios12-sdk-simulator.json
View file @ be36e3f4
......@@ -4,7 +4,7 @@
"on iPad, iPhone, @3x, and @2x on main and CQ ios12-beta-simulator.",
"Note: Xcode 10 requires Mac OS 10.13.4 or higher, hence 'host os'."
],
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"gn_args": [
"additional_target_cpus=[\"x86\"]",
"goma_dir=\"$(goma_dir)\"",
......
ios/build/bots/chromium.mac/ios12-sdk-simulator.json
View file @ be36e3f4
......@@ -4,7 +4,7 @@
"on iPad, iPhone, @3x, and @2x on main and CQ ios12-beta-simulator.",
"Note: Xcode 10.3 requires Mac OS 10.13.X or higher, hence 'host os'."
],
"xcode build version": "10L221o",
"xcode build version": "10l232m",
"gn_args": [
"additional_target_cpus=[\"x86\"]",
"goma_dir=\"$(goma_dir)\"",
......
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