diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2017-11-02 17:08:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-03 16:26:34 +0000 |
| commit | c2d18f34de6fc7a07d1ea8dd4ef7840a2b412f14 (patch) | |
| tree | 63974ee1a7325365d724dd414de52e6082f4f60e /infra | |
| parent | 0cbc10f94e2b350761e64b225c97390269f41479 (diff) | |
Specify minor MacOS version before upgrade.
Bug: skia:7203
NoTry: true
Change-Id: I24a098bff3897e36cf2a6125980e842b37261a2a
Reviewed-on: https://skia-review.googlesource.com/67320
Reviewed-by: Stephan Altmueller <stephana@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/bots/gen_tasks.go | 2 | ||||
| -rw-r--r-- | infra/bots/tasks.json | 60 |
2 files changed, 25 insertions, 37 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 06b1063731..282803c711 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -186,7 +186,7 @@ func defaultSwarmDimensions(parts map[string]string) []string { "Chromecast": "Android", "ChromeOS": "ChromeOS", "Debian9": DEFAULT_OS_DEBIAN, - "Mac": "Mac-10.12", + "Mac": "Mac-10.12.2", "Ubuntu14": DEFAULT_OS_UBUNTU, "Ubuntu16": "Ubuntu-16.10", "Ubuntu17": "Ubuntu-17.04", diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 2e81ef11d8..ee9262b122 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -4678,9 +4678,8 @@ }, "Build-Mac-Clang-arm-Debug-iOS": { "dimensions": [ - "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "extra_args": [ @@ -4701,9 +4700,8 @@ }, "Build-Mac-Clang-arm-Release-iOS": { "dimensions": [ - "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "extra_args": [ @@ -4731,9 +4729,8 @@ } ], "dimensions": [ - "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "extra_args": [ @@ -4754,9 +4751,8 @@ }, "Build-Mac-Clang-arm64-Debug-iOS": { "dimensions": [ - "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "extra_args": [ @@ -4777,9 +4773,8 @@ }, "Build-Mac-Clang-arm64-Release-iOS": { "dimensions": [ - "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "extra_args": [ @@ -4800,9 +4795,8 @@ }, "Build-Mac-Clang-x64-Release-iOS": { "dimensions": [ - "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "extra_args": [ @@ -4823,9 +4817,8 @@ }, "Build-Mac-Clang-x86_64-Debug": { "dimensions": [ - "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "extra_args": [ @@ -4846,9 +4839,8 @@ }, "Build-Mac-Clang-x86_64-Debug-CommandBuffer": { "dimensions": [ - "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "extra_args": [ @@ -4869,9 +4861,8 @@ }, "Build-Mac-Clang-x86_64-Debug-Metal": { "dimensions": [ - "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "extra_args": [ @@ -4892,9 +4883,8 @@ }, "Build-Mac-Clang-x86_64-Release": { "dimensions": [ - "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "extra_args": [ @@ -4915,9 +4905,8 @@ }, "Build-Mac-Clang-x86_64-Release-CommandBuffer": { "dimensions": [ - "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "extra_args": [ @@ -4938,9 +4927,8 @@ }, "Build-Mac-Clang-x86_64-Release-TSAN": { "dimensions": [ - "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "extra_args": [ @@ -9029,7 +9017,7 @@ "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9077,7 +9065,7 @@ "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9124,7 +9112,7 @@ ], "dimensions": [ "gpu:8086:0a2e", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9171,7 +9159,7 @@ ], "dimensions": [ "gpu:8086:0a2e", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -9218,7 +9206,7 @@ ], "dimensions": [ "gpu:8086:0a2e", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17753,7 +17741,7 @@ "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17801,7 +17789,7 @@ "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17849,7 +17837,7 @@ "dimensions": [ "cpu:x86-64-E5-2697_v2", "gpu:none", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17896,7 +17884,7 @@ ], "dimensions": [ "gpu:8086:0a2e", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17943,7 +17931,7 @@ ], "dimensions": [ "gpu:8086:0a2e", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -17990,7 +17978,7 @@ ], "dimensions": [ "gpu:8086:0a2e", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "execution_timeout_ns": 14400000000000, @@ -18037,7 +18025,7 @@ ], "dimensions": [ "gpu:8086:0a2e", - "os:Mac-10.12", + "os:Mac-10.12.2", "pool:Skia" ], "execution_timeout_ns": 14400000000000, |