Skip to content

GitLab

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

[ios] Roll Xcode 10 from beta 1 to beta 2. 

TBR=hinoka@chromium.org

Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I9f05716edc1ee2b47af96557295cdf4cbd9f43a0
Reviewed-on: https://chromium-review.googlesource.com/1106677
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Reviewed-by: default avatarSergey Berezin <sergeyberezin@chromium.org>
Reviewed-by: default avatarRohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568791}
parent fb5eeb3d
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 471 deletions
infra/config/global/cr-buildbucket.cfg
View file @ 42a76448
...@@ -377,9 +377,9 @@ builder_mixins { ...@@ -377,9 +377,9 @@ builder_mixins {
builder_mixins { builder_mixins {
name: "xcode-10-caches" name: "xcode-10-caches"
caches: { caches: {
# Cache for Xcode 10.0 beta 1 (build version 10l176w) needed for iOS builds. # Cache for Xcode 10.0 beta 2 (build version 10L177m) needed for iOS builds.
name: "xcode_ios_10l176w" name: "xcode_ios_10l177m"
path: "xcode_ios_10l176w.app" path: "xcode_ios_10l177m.app"
} }
} }
......
ios/build/bots/chromium.fyi/ios12-sdk-device.json
View file @ 42a76448
...@@ -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": "10l176w", "xcode build version": "10l177m",
"gn_args": [ "gn_args": [
"additional_target_cpus=[ \"arm64\" ]", "additional_target_cpus=[ \"arm64\" ]",
"goma_dir=\"$(goma_dir)\"", "goma_dir=\"$(goma_dir)\"",
......
ios/build/bots/chromium.fyi/ios12-sdk-simulator.json
View file @ 42a76448
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"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.3 requires Mac OS 10.13.X or higher, hence 'host os'." "Note: Xcode 10.3 requires Mac OS 10.13.X or higher, hence 'host os'."
], ],
"xcode build version": "10l176w", "xcode build version": "10l177m",
"gn_args": [ "gn_args": [
"additional_target_cpus=[\"x86\"]", "additional_target_cpus=[\"x86\"]",
"goma_dir=\"$(goma_dir)\"", "goma_dir=\"$(goma_dir)\"",
...@@ -25,328 +25,115 @@ ...@@ -25,328 +25,115 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.0", "os": "12.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.0", "os": "12.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.0", "os": "12.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 7", "device type": "iPhone 7",
"os": "12.0", "os": "12.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"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": "8E3004b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 7", "device type": "iPhone 7",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "10.3", "os": "10.3",
"xcode build version": "8E3004b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"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": "8E3004b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"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.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"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.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"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.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"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": "8E3004b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
},
{
"include": "common_tests.json",
"device type": "iPhone 6s",
"os": "12.0",
"dimensions": [
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"include": "common_tests.json", "include": "common_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
},
{
"include": "common_tests.json",
"device type": "iPad Air 2",
"os": "10.3",
"xcode build version": "8E3004b",
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "12.0", "os": "12.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
} }
] ]
} }
ios/build/bots/chromium.fyi/ios12-sdk-xcode-clang.json
View file @ 42a76448
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"Tests for super-fat iOS 12.0.", "Tests for super-fat iOS 12.0.",
"Build is performed with gn+ninja." "Build is performed with gn+ninja."
], ],
"xcode build version": "10l176w", "xcode build version": "10l177m",
"use xcode build version": true, "use xcode build version": true,
"gn_args": [ "gn_args": [
"additional_target_cpus=[\"x86\"]", "additional_target_cpus=[\"x86\"]",
......
ios/build/bots/chromium.mac/ios12-sdk-simulator.json
View file @ 42a76448
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"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.3 requires Mac OS 10.13.X or higher, hence 'host os'." "Note: Xcode 10.3 requires Mac OS 10.13.X or higher, hence 'host os'."
], ],
"xcode build version": "10l176w", "xcode build version": "10l177m",
"gn_args": [ "gn_args": [
"additional_target_cpus=[\"x86\"]", "additional_target_cpus=[\"x86\"]",
"goma_dir=\"$(goma_dir)\"", "goma_dir=\"$(goma_dir)\"",
...@@ -25,328 +25,115 @@ ...@@ -25,328 +25,115 @@
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.0", "os": "12.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.0", "os": "12.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.0", "os": "12.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 7", "device type": "iPhone 7",
"os": "12.0", "os": "12.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"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": "8E3004b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone 7", "device type": "iPhone 7",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "10.3", "os": "10.3",
"xcode build version": "8E3004b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_tests.json", "include": "eg_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"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": "8E3004b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"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.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"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.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"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.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"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": "8E3004b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
},
{
"include": "common_tests.json",
"device type": "iPhone 6s",
"os": "12.0",
"dimensions": [
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"include": "common_tests.json", "include": "common_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
},
{
"include": "common_tests.json",
"device type": "iPad Air 2",
"os": "10.3",
"xcode build version": "8E3004b",
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "12.0", "os": "12.0",
"dimensions": [ "host os": "Mac-10.13.5"
{
"os": "Mac-10.13.4",
"pool": "Chrome"
},
{
"os": "Mac-10.13.5",
"pool": "Chrome"
}
]
}, },
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "11.2", "os": "11.2",
"xcode build version": "9C40b", "host os": "Mac-10.13.5"
"dimensions": [
{
"os": "Mac-10.12",
"pool": "Chrome"
},
{
"os": "Mac-10.13",
"pool": "Chrome"
}
]
} }
] ]
} }
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