From 01042067beb17f8682a59a07c3268542ef16cdc2 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Thu, 3 May 2018 11:27:14 +0200 Subject: [PATCH] Specify Xcode 9.2 and macOS versions that support it [part 2] "xcode version" key is deprecated. These are the same changes as in https://webrtc-review.googlesource.com/74000 but I just forgot to apply them to some of the bots. TBR: phoglund@webrtc.org Bug: chromium:838854, webrtc:9201 Change-Id: Ia041bcc185fae65681e63d17a6ad7bc081ffa6ab Reviewed-on: https://webrtc-review.googlesource.com/74040 Reviewed-by: Oleh Prypin Commit-Queue: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#23090} --- .../internal.tryserver.webrtc/ios_arm64_dbg.json | 2 +- .../internal.tryserver.webrtc/ios_arm64_perf.json | 2 +- .../internal.tryserver.webrtc/ios_arm64_rel.json | 2 +- .../ios/tryserver.webrtc/ios32_sim_ios9_dbg.json | 14 ++++++++++++-- .../ios/tryserver.webrtc/ios64_sim_ios10_dbg.json | 14 ++++++++++++-- .../ios/tryserver.webrtc/ios64_sim_ios11_dbg.json | 14 ++++++++++++-- .../ios/tryserver.webrtc/ios64_sim_ios9_dbg.json | 14 ++++++++++++-- 7 files changed, 51 insertions(+), 11 deletions(-) diff --git a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_dbg.json b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_dbg.json index 66fb27f600..4a13c57c96 100644 --- a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_dbg.json +++ b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_dbg.json @@ -2,7 +2,7 @@ "comments": [ "Tests for 64-bit iOS devices." ], - "xcode version": "9.0", + "xcode build version": "9C40b", "gn_args": [ "goma_dir=\"$(goma_dir)\"", "is_component_build=false", diff --git a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_perf.json b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_perf.json index a34dffa88e..45e86eba3e 100644 --- a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_perf.json +++ b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_perf.json @@ -2,7 +2,7 @@ "comments": [ "Tests for 64-bit iOS devices." ], - "xcode version": "9.0", + "xcode build version": "9C40b", "gn_args": [ "goma_dir=\"$(goma_dir)\"", "is_component_build=false", diff --git a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_rel.json b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_rel.json index e7fbec6d70..e8c2d62861 100644 --- a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_rel.json +++ b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_rel.json @@ -2,7 +2,7 @@ "comments": [ "Tests for 64-bit iOS devices." ], - "xcode version": "9.0", + "xcode build version": "9C40b", "gn_args": [ "dcheck_always_on=true", "goma_dir=\"$(goma_dir)\"", diff --git a/tools_webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json index 242df5ff3d..8eeece96ff 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios32_sim_ios9_dbg.json @@ -2,7 +2,7 @@ "comments": [ "Tests for 32-bit iOS simulators." ], - "xcode version": "9.0", + "xcode build version": "9C40b", "gn_args": [ "goma_dir=\"$(goma_dir)\"", "is_component_build=false", @@ -19,7 +19,17 @@ { "include": "common_tests.json", "device type": "iPhone 5", - "os": "9.3" + "os": "9.3", + "dimensions": [ + { + "os": "Mac-10.12", + "pool": "Chrome" + }, + { + "os": "Mac-10.13", + "pool": "Chrome" + } + ] } ] } diff --git a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json index a902cc1429..44a6063ca3 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios10_dbg.json @@ -2,7 +2,7 @@ "comments": [ "Tests for 64-bit iOS simulators." ], - "xcode version": "9.0", + "xcode build version": "9C40b", "gn_args": [ "goma_dir=\"$(goma_dir)\"", "is_component_build=false", @@ -19,7 +19,17 @@ { "include": "common_tests.json", "device type": "iPhone 6s", - "os": "10.3" + "os": "10.3", + "dimensions": [ + { + "os": "Mac-10.12", + "pool": "Chrome" + }, + { + "os": "Mac-10.13", + "pool": "Chrome" + } + ] } ] } diff --git a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios11_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios11_dbg.json index 6804a60d2e..c145ddaf40 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios11_dbg.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios11_dbg.json @@ -2,7 +2,7 @@ "comments": [ "Tests for 64-bit iOS simulators." ], - "xcode version": "9.0", + "xcode build version": "9C40b", "gn_args": [ "goma_dir=\"$(goma_dir)\"", "is_component_build=false", @@ -19,7 +19,17 @@ { "include": "common_tests.json", "device type": "iPhone 7", - "os": "11.0" + "os": "11.0", + "dimensions": [ + { + "os": "Mac-10.12", + "pool": "Chrome" + }, + { + "os": "Mac-10.13", + "pool": "Chrome" + } + ] } ] } diff --git a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json b/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json index 25eadbec03..2c0d62be4c 100644 --- a/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json +++ b/tools_webrtc/ios/tryserver.webrtc/ios64_sim_ios9_dbg.json @@ -2,7 +2,7 @@ "comments": [ "Tests for 64-bit iOS simulators." ], - "xcode version": "9.0", + "xcode build version": "9C40b", "gn_args": [ "goma_dir=\"$(goma_dir)\"", "is_component_build=false", @@ -19,7 +19,17 @@ { "include": "common_tests.json", "device type": "iPhone 6s", - "os": "9.3" + "os": "9.3", + "dimensions": [ + { + "os": "Mac-10.12", + "pool": "Chrome" + }, + { + "os": "Mac-10.13", + "pool": "Chrome" + } + ] } ] }