AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[infra] Upgrade iPhone7, iPhone8, and iPadPro to iOS 13.3.1.

Browse Source 
Change-Id: I2d10bf0b9b7ac3833c60b7c6dca2d05ab7e99cc4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/259283
Reviewed-by: Weston Tracey <westont@google.com>
Commit-Queue: Ben Wagner aka dogben <benjaminwagner@google.com>
This commit is contained in:
Ben Wagner 2020-02-28 16:12:05 -05:00 committed by Skia Commit-Bot
parent c2b6769ab2
commit 54cb21430c
7 changed files with 147 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
infra/bots/assets/ios-dev-image-13.3/README.md Normal file
View File

@ -0,0 +1,8 @@
To create or update this asset, you will need a Mac with Xcode installed. Just
run
```shell
./upload.py --target_dir \
/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/DeviceSup‌​port/13.3
```

1
infra/bots/assets/ios-dev-image-13.3/VERSION Normal file
View File

@ -0,0 +1 @@
0

26
infra/bots/assets/ios-dev-image-13.3/common.py Executable file
View File

@ -0,0 +1,26 @@
#!/usr/bin/env python
#
# Copyright 2017 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Common vars used by scripts in this directory."""
import os
import sys
FILE_DIR = os.path.dirname(os.path.abspath(__file__))
INFRA_BOTS_DIR = os.path.realpath(os.path.join(FILE_DIR, os.pardir, os.pardir))
sys.path.insert(0, INFRA_BOTS_DIR)
from assets import assets
ASSET_NAME = os.path.basename(FILE_DIR)
def run(cmd):
"""Run a command, eg. "upload" or "download". """
assets.main([cmd, ASSET_NAME] + sys.argv[1:])

16
infra/bots/assets/ios-dev-image-13.3/download.py Executable file
View File

@ -0,0 +1,16 @@
#!/usr/bin/env python
#
# Copyright 2017 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Download the current version of the asset."""
import common
if __name__ == '__main__':
common.run('download')

16
infra/bots/assets/ios-dev-image-13.3/upload.py Executable file
View File

@ -0,0 +1,16 @@
#!/usr/bin/env python
#
# Copyright 2017 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Upload a new version of the asset."""
import common
if __name__ == '__main__':
common.run('upload')

10
infra/bots/gen_tasks_logic/gen_tasks_logic.go
View File

@ -571,7 +571,7 @@ func (b *builder) defaultSwarmDimensions(parts map[string]string) []string {
"Win2019": DEFAULT_OS_WIN,
"Win7": "Windows-7-SP1",
"Win8": "Windows-8.1-SP0",
"iOS": "iOS-11.4.1",
"iOS": "iOS-13.3.1",
}[os]
if !ok {
glog.Fatalf("Entry %q not found in OS mapping.", os)
@ -588,6 +588,10 @@ func (b *builder) defaultSwarmDimensions(parts map[string]string) []string {
// This is currently a unique snowflake.
d["os"] = "Windows-10"
}
if parts["model"] == "iPhone6" {
// Not ready to upgrade iPhone6 yet.
d["os"] = "iOS-11.4.1"
}
} else {
d["os"] = DEFAULT_OS_DEBIAN
}
@ -1112,9 +1116,11 @@ func (b *builder) maybeAddIosDevImage(name string, t *specs.TaskSpec) {
if m := iosRegex.FindStringSubmatch(dim); len(m) >= 2 {
var asset string
switch m[1] {
// Other patch versions for 11.4 can be added here.
// Other patch versions can be added to the same case.
case "11.4.1":
asset = "ios-dev-image-11.4"
case "13.3.1":
asset = "ios-dev-image-13.3"
default:
glog.Fatalf("Unable to determine correct ios-dev-image asset for %s. If %s is a new iOS release, you must add a CIPD package containing the corresponding iOS dev image; see ios-dev-image-11.4 for an example.", name, m[1])
}

144
infra/bots/tasks.json
View File

@ -25061,9 +25061,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -25085,7 +25085,7 @@
"dimensions": [
"device_type:iPad6,3",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -25133,9 +25133,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -25157,7 +25157,7 @@
"dimensions": [
"device_type:iPad6,3",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -25349,9 +25349,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -25373,7 +25373,7 @@
"dimensions": [
"device_type:iPhone9,1",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -25421,9 +25421,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -25445,7 +25445,7 @@
"dimensions": [
"device_type:iPhone9,1",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -25493,9 +25493,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -25517,7 +25517,7 @@
"dimensions": [
"device_type:iPhone10,1",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -25565,9 +25565,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -25589,7 +25589,7 @@
"dimensions": [
"device_type:iPhone10,1",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -48116,9 +48116,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -48140,7 +48140,7 @@
"dimensions": [
"device_type:iPad6,3",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -48188,9 +48188,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -48212,7 +48212,7 @@
"dimensions": [
"device_type:iPad6,3",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -48260,9 +48260,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -48284,7 +48284,7 @@
"dimensions": [
"device_type:iPad6,3",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -48332,9 +48332,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -48356,7 +48356,7 @@
"dimensions": [
"device_type:iPad6,3",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -48692,9 +48692,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -48716,7 +48716,7 @@
"dimensions": [
"device_type:iPhone9,1",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -48764,9 +48764,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -48788,7 +48788,7 @@
"dimensions": [
"device_type:iPhone9,1",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -48836,9 +48836,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -48860,7 +48860,7 @@
"dimensions": [
"device_type:iPhone9,1",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -48908,9 +48908,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -48932,7 +48932,7 @@
"dimensions": [
"device_type:iPhone9,1",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -48980,9 +48980,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -49004,7 +49004,7 @@
"dimensions": [
"device_type:iPhone10,1",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -49052,9 +49052,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -49076,7 +49076,7 @@
"dimensions": [
"device_type:iPhone10,1",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -49124,9 +49124,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -49148,7 +49148,7 @@
"dimensions": [
"device_type:iPhone10,1",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {
@ -49196,9 +49196,9 @@
"version": "git_revision:27f8448ba7ae1dd64574aefa41b762c3d22a42f4"
},
{
"name": "skia/bots/ios-dev-image-11.4",
"path": "ios-dev-image-11.4",
"version": "version:1"
"name": "skia/bots/ios-dev-image-13.3",
"path": "ios-dev-image-13.3",
"version": "version:0"
}
],
"command": [
@ -49220,7 +49220,7 @@
"dimensions": [
"device_type:iPhone10,1",
"libimobiledevice:1582155448",
"os:iOS-11.4.1",
"os:iOS-13.3.1",
"pool:Skia"
],
"env_prefixes": {