From 2e28edaa8a25f0baf8b693359b750f8446093f88 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Thu, 3 May 2018 07:59:53 +0200 Subject: [PATCH] Specify Xcode 9.2 and macOS versions that support it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "xcode version" key is deprecated. Bug: chromium:838854, webrtc:9201 Change-Id: I55770a1a9c8301106b2d194e2e3f727ef0e63626 Reviewed-on: https://webrtc-review.googlesource.com/74000 Reviewed-by: Patrik Höglund Commit-Queue: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#23086} --- .../ios/client.webrtc.branches/iOS (beta).json | 14 ++++++++++++-- .../ios/client.webrtc.branches/iOS (stable).json | 14 ++++++++++++-- tools_webrtc/ios/client.webrtc/iOS32_Debug.json | 2 +- tools_webrtc/ios/client.webrtc/iOS32_Release.json | 2 +- .../client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json | 14 ++++++++++++-- tools_webrtc/ios/client.webrtc/iOS64_Debug.json | 2 +- tools_webrtc/ios/client.webrtc/iOS64_Release.json | 2 +- .../client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json | 14 ++++++++++++-- .../client.webrtc/iOS64_Sim_Debug_(iOS_11.0).json | 14 ++++++++++++-- .../client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json | 14 ++++++++++++-- .../ios/internal.client.webrtc/iOS64_Debug.json | 14 ++++++++++++-- .../ios/internal.client.webrtc/iOS64_Perf.json | 14 ++++++++++++-- .../ios/internal.client.webrtc/iOS64_Release.json | 14 ++++++++++++-- .../internal.tryserver.webrtc/ios_arm64_dbg.json | 12 +++++++++++- .../internal.tryserver.webrtc/ios_arm64_perf.json | 12 +++++++++++- .../internal.tryserver.webrtc/ios_arm64_rel.json | 12 +++++++++++- 16 files changed, 145 insertions(+), 25 deletions(-) diff --git a/tools_webrtc/ios/client.webrtc.branches/iOS (beta).json b/tools_webrtc/ios/client.webrtc.branches/iOS (beta).json index 59dab8a597..8912312fd8 100644 --- a/tools_webrtc/ios/client.webrtc.branches/iOS (beta).json +++ b/tools_webrtc/ios/client.webrtc.branches/iOS (beta).json @@ -2,7 +2,7 @@ "comments": [ "Tests for 64-bit iOS simulators." ], - "xcode version": "8.0", + "xcode build version": "9C40b", "gn_args": [ "goma_dir=\"$(goma_dir)\"", "is_component_build=false", @@ -18,7 +18,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/client.webrtc.branches/iOS (stable).json b/tools_webrtc/ios/client.webrtc.branches/iOS (stable).json index 59dab8a597..8912312fd8 100644 --- a/tools_webrtc/ios/client.webrtc.branches/iOS (stable).json +++ b/tools_webrtc/ios/client.webrtc.branches/iOS (stable).json @@ -2,7 +2,7 @@ "comments": [ "Tests for 64-bit iOS simulators." ], - "xcode version": "8.0", + "xcode build version": "9C40b", "gn_args": [ "goma_dir=\"$(goma_dir)\"", "is_component_build=false", @@ -18,7 +18,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/client.webrtc/iOS32_Debug.json b/tools_webrtc/ios/client.webrtc/iOS32_Debug.json index 4617fa9ec0..4ae5e99415 100644 --- a/tools_webrtc/ios/client.webrtc/iOS32_Debug.json +++ b/tools_webrtc/ios/client.webrtc/iOS32_Debug.json @@ -2,7 +2,7 @@ "comments": [ "Builder for 32-bit devices." ], - "xcode version": "9.0", + "xcode build version": "9C40b", "gn_args": [ "goma_dir=\"$(goma_dir)\"", "ios_enable_code_signing=false", diff --git a/tools_webrtc/ios/client.webrtc/iOS32_Release.json b/tools_webrtc/ios/client.webrtc/iOS32_Release.json index d03472102d..ed915458bb 100644 --- a/tools_webrtc/ios/client.webrtc/iOS32_Release.json +++ b/tools_webrtc/ios/client.webrtc/iOS32_Release.json @@ -2,7 +2,7 @@ "comments": [ "Builder for 32-bit devices." ], - "xcode version": "9.0", + "xcode build version": "9C40b", "gn_args": [ "goma_dir=\"$(goma_dir)\"", "dcheck_always_on=true", diff --git a/tools_webrtc/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json b/tools_webrtc/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json index d4f80a9d79..54e3c17fec 100644 --- a/tools_webrtc/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).json +++ b/tools_webrtc/ios/client.webrtc/iOS32_Sim_Debug_(iOS_9.0).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", @@ -18,7 +18,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/client.webrtc/iOS64_Debug.json b/tools_webrtc/ios/client.webrtc/iOS64_Debug.json index dc2a7e8e6c..2af5805c33 100644 --- a/tools_webrtc/ios/client.webrtc/iOS64_Debug.json +++ b/tools_webrtc/ios/client.webrtc/iOS64_Debug.json @@ -2,7 +2,7 @@ "comments": [ "Builder for 64-bit devices." ], - "xcode version": "9.0", + "xcode build version": "9C40b", "gn_args": [ "goma_dir=\"$(goma_dir)\"", "ios_enable_code_signing=false", diff --git a/tools_webrtc/ios/client.webrtc/iOS64_Release.json b/tools_webrtc/ios/client.webrtc/iOS64_Release.json index 9bb5535ac0..a59ef83fd6 100644 --- a/tools_webrtc/ios/client.webrtc/iOS64_Release.json +++ b/tools_webrtc/ios/client.webrtc/iOS64_Release.json @@ -2,7 +2,7 @@ "comments": [ "Builder for 64-bit devices." ], - "xcode version": "9.0", + "xcode build version": "9C40b", "gn_args": [ "goma_dir=\"$(goma_dir)\"", "dcheck_always_on=true", diff --git a/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json index 2db5127ff7..fe7558eaed 100644 --- a/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).json +++ b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_10.0).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", @@ -18,7 +18,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/client.webrtc/iOS64_Sim_Debug_(iOS_11.0).json b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_11.0).json index af7e82d41a..c25e3d1b14 100644 --- a/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_11.0).json +++ b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_11.0).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", @@ -18,7 +18,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/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json index 5d77927d27..929897747a 100644 --- a/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).json +++ b/tools_webrtc/ios/client.webrtc/iOS64_Sim_Debug_(iOS_9.0).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", @@ -18,7 +18,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" + } + ] } ] } diff --git a/tools_webrtc/ios/internal.client.webrtc/iOS64_Debug.json b/tools_webrtc/ios/internal.client.webrtc/iOS64_Debug.json index 617c921e09..4a13c57c96 100644 --- a/tools_webrtc/ios/internal.client.webrtc/iOS64_Debug.json +++ b/tools_webrtc/ios/internal.client.webrtc/iOS64_Debug.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", @@ -22,7 +22,17 @@ { "include": "real_device_tests.json", "device type": "iPhone 6s", - "os": "10.3.3" + "os": "10.3.3", + "dimensions": [ + { + "os": "Mac-10.12", + "pool": "Chrome" + }, + { + "os": "Mac-10.13", + "pool": "Chrome" + } + ] } ] } diff --git a/tools_webrtc/ios/internal.client.webrtc/iOS64_Perf.json b/tools_webrtc/ios/internal.client.webrtc/iOS64_Perf.json index c681404329..482ccf19a2 100644 --- a/tools_webrtc/ios/internal.client.webrtc/iOS64_Perf.json +++ b/tools_webrtc/ios/internal.client.webrtc/iOS64_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", @@ -22,7 +22,17 @@ { "include": "perf_tests.json", "device type": "iPhone 7", - "os": "11.0.3" + "os": "11.0.3", + "dimensions": [ + { + "os": "Mac-10.12", + "pool": "Chrome" + }, + { + "os": "Mac-10.13", + "pool": "Chrome" + } + ] } ] } diff --git a/tools_webrtc/ios/internal.client.webrtc/iOS64_Release.json b/tools_webrtc/ios/internal.client.webrtc/iOS64_Release.json index 1d3ea411ea..e8c2d62861 100644 --- a/tools_webrtc/ios/internal.client.webrtc/iOS64_Release.json +++ b/tools_webrtc/ios/internal.client.webrtc/iOS64_Release.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)\"", @@ -23,7 +23,17 @@ { "include": "real_device_tests.json", "device type": "iPhone 6s", - "os": "10.3.3" + "os": "10.3.3", + "dimensions": [ + { + "os": "Mac-10.12", + "pool": "Chrome" + }, + { + "os": "Mac-10.13", + "pool": "Chrome" + } + ] } ], "expiration_time": 3600 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 617c921e09..66fb27f600 100644 --- a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_dbg.json +++ b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_dbg.json @@ -22,7 +22,17 @@ { "include": "real_device_tests.json", "device type": "iPhone 6s", - "os": "10.3.3" + "os": "10.3.3", + "dimensions": [ + { + "os": "Mac-10.12", + "pool": "Chrome" + }, + { + "os": "Mac-10.13", + "pool": "Chrome" + } + ] } ] } 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 d21b1fc12b..a34dffa88e 100644 --- a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_perf.json +++ b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_perf.json @@ -22,7 +22,17 @@ { "include": "perf_trybot_tests.json", "device type": "iPhone 7", - "os": "11.0.3" + "os": "11.0.3", + "dimensions": [ + { + "os": "Mac-10.12", + "pool": "Chrome" + }, + { + "os": "Mac-10.13", + "pool": "Chrome" + } + ] } ] } 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 1d3ea411ea..e7fbec6d70 100644 --- a/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_rel.json +++ b/tools_webrtc/ios/internal.tryserver.webrtc/ios_arm64_rel.json @@ -23,7 +23,17 @@ { "include": "real_device_tests.json", "device type": "iPhone 6s", - "os": "10.3.3" + "os": "10.3.3", + "dimensions": [ + { + "os": "Mac-10.12", + "pool": "Chrome" + }, + { + "os": "Mac-10.13", + "pool": "Chrome" + } + ] } ], "expiration_time": 3600