Commit f069af5b authored by Lindsay Pasricha's avatar Lindsay Pasricha Committed by Commit Bot

Roll upstream FYI to xcode10.1 and iOS12.1.

ios12-beta-simulator.json
ios12-sdk-device.json
ios12-sdk-simulator.json
ios12-sdk-xcode-clang.json

xcode10.1 (10o23u)

Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: Id0dac987f4f4c6cda6e1ff4149dd612be5c65bea
Reviewed-on: https://chromium-review.googlesource.com/1249397
Commit-Queue: Lindsay Pasricha <lindsayw@chromium.org>
Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594874}
parent 43ab0ff8
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
{ {
"include": "common_tests.json", "include": "common_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone 6 Plus", "device type": "iPhone 6 Plus",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone 5s", "device type": "iPhone 5s",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -62,8 +62,8 @@ ...@@ -62,8 +62,8 @@
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPad Pro", "device type": "iPad Pro",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 6 Plus", "device type": "iPhone 6 Plus",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -95,8 +95,8 @@ ...@@ -95,8 +95,8 @@
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPad Air", "device type": "iPad Air",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -106,8 +106,8 @@ ...@@ -106,8 +106,8 @@
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 5s", "device type": "iPhone 5s",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -117,8 +117,8 @@ ...@@ -117,8 +117,8 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPhone 6s Plus", "device type": "iPhone 6s Plus",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -139,8 +139,8 @@ ...@@ -139,8 +139,8 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPhone 5s", "device type": "iPhone 5s",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -150,8 +150,8 @@ ...@@ -150,8 +150,8 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.0", "os": "12.1",
"xcode build version": "10a254a", "xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Build is performed with gn+ninja.", "Build is performed with gn+ninja.",
"If modified, please change chromium.fyi/ios-device-goma-canary-clobber.json too." "If modified, please change chromium.fyi/ios-device-goma-canary-clobber.json too."
], ],
"xcode build version": "10a254a", "xcode build version": "10o23u",
"gn_args": [ "gn_args": [
"additional_target_cpus=[ \"arm64\" ]", "additional_target_cpus=[ \"arm64\" ]",
"goma_dir=\"$(goma_dir)\"", "goma_dir=\"$(goma_dir)\"",
......
{ {
"comments": [ "comments": [
"Runs tests on 64-bit iOS 10.3 and 11.4 and 12.0 tests", "Runs tests on 64-bit iOS 10.3 and 11.4 and 12.1 tests",
"on iPad, iPhone, @3x, and @2x on main and CQ ios12-beta-simulator.", "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'." "Note: Xcode 10 requires Mac OS 10.13.4 or higher, hence 'host os'."
], ],
"xcode build version": "10a254a", "xcode build version": "10o23u",
"gn_args": [ "gn_args": [
"additional_target_cpus=[\"x86\"]", "additional_target_cpus=[\"x86\"]",
"goma_dir=\"$(goma_dir)\"", "goma_dir=\"$(goma_dir)\"",
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.0", "os": "12.1",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -33,7 +34,8 @@ ...@@ -33,7 +34,8 @@
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.0", "os": "12.1",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -43,7 +45,8 @@ ...@@ -43,7 +45,8 @@
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.0", "os": "12.1",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -53,7 +56,8 @@ ...@@ -53,7 +56,8 @@
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 7", "device type": "iPhone 7",
"os": "12.0", "os": "12.1",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -64,6 +68,7 @@ ...@@ -64,6 +68,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 6s Plus", "device type": "iPhone 6s Plus",
"os": "10.3", "os": "10.3",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -74,6 +79,7 @@ ...@@ -74,6 +79,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 7", "device type": "iPhone 7",
"os": "11.4", "os": "11.4",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -84,6 +90,7 @@ ...@@ -84,6 +90,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.4", "os": "11.4",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -104,6 +111,7 @@ ...@@ -104,6 +111,7 @@
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.4", "os": "11.4",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -114,6 +122,7 @@ ...@@ -114,6 +122,7 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "10.3", "os": "10.3",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -124,6 +133,7 @@ ...@@ -124,6 +133,7 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.4", "os": "11.4",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -133,7 +143,8 @@ ...@@ -133,7 +143,8 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPhone 6s Plus", "device type": "iPhone 6s Plus",
"os": "12.0", "os": "12.1",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -143,7 +154,8 @@ ...@@ -143,7 +154,8 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "12.0", "os": "12.1",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -153,7 +165,8 @@ ...@@ -153,7 +165,8 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.0", "os": "12.1",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -164,6 +177,7 @@ ...@@ -164,6 +177,7 @@
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.4", "os": "11.4",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -174,6 +188,7 @@ ...@@ -174,6 +188,7 @@
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "10.3", "os": "10.3",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -184,6 +199,7 @@ ...@@ -184,6 +199,7 @@
"include": "common_tests.json", "include": "common_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "11.4", "os": "11.4",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -193,7 +209,8 @@ ...@@ -193,7 +209,8 @@
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "12.0", "os": "12.1",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
...@@ -204,6 +221,7 @@ ...@@ -204,6 +221,7 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "11.4", "os": "11.4",
"xcode build version": "10o23u",
"dimensions": [ "dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" }, { "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" }, { "os": "Mac-10.13.5", "pool": "Chrome" },
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"the final GM, but disabled for the other betas to reduce swirl for the", "the final GM, but disabled for the other betas to reduce swirl for the",
"goma team. Build is performed with gn+ninja." "goma team. Build is performed with gn+ninja."
], ],
"xcode build version": "10l213o", "xcode build version": "10o23u",
"use xcode build version": true, "use xcode build version": true,
"gn_args": [ "gn_args": [
"additional_target_cpus=[\"x86\"]", "additional_target_cpus=[\"x86\"]",
......
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