From 5d83ebaffa9d0b8e34d6327d223b35f6ec2078e9 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Thu, 17 Aug 2023 20:45:08 -0700 Subject: [PATCH 01/17] Test using all macs. --- ci/builders/mac_host_engine.json | 12 +++--------- ci/builders/mac_ios_engine.json | 5 ----- ci/builders/mac_unopt.json | 4 +--- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index cc3a336302a50..c5a3612deec0f 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -15,9 +15,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86", - "mac_model=Macmini8,1" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -79,9 +77,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86", - "mac_model=Macmini8,1" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -139,9 +135,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86", - "mac_model=Macmini8,1" + "os=Mac-12" ], "dependencies": [ { diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index ec58321c7fc22..51ae3a9375dc2 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -3,7 +3,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -26,7 +25,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -50,7 +48,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -74,7 +71,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -99,7 +95,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 1be5de70ffcab..9e11cf5817401 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -11,9 +11,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86", - "mac_model=Macmini8,1" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false From 1471d9e131958ac4dad49d372670383dae50a8f0 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Thu, 17 Aug 2023 21:43:24 -0700 Subject: [PATCH 02/17] Move host_debug to global tests. --- ci/builders/mac_host_engine.json | 47 ++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index c5a3612deec0f..b2ed2b32724b2 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -47,21 +47,7 @@ "$flutter/osx_sdk": { "sdk_version": "14e300c" } - }, - "tests": [ - { - "language": "python3", - "name": "Host Tests for host_debug", - "parameters": [ - "--variant", - "host_debug", - "--type", - "dart,engine", - "--engine-capture-core-dump" - ], - "script": "flutter/testing/run_tests.py" - } - ] + } }, { "archives": [ @@ -470,5 +456,36 @@ "destination": "darwin-x64-release/gen_snapshot.zip", "realm": "production" } + ], + "tests": [ + { + "name": "Mac Host Tests for host_debug", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12", + "cpu=x86" + ], + "gclient_variables": { + "download_android_deps": false + }, + "dependencies": [ + "host_debug" + ], + "tasks": [ + { + "language": "python3", + "name": "Host Tests for host_debug", + "parameters": [ + "--variant", + "host_debug", + "--type", + "dart,engine", + "--engine-capture-core-dump" + ], + "script": "flutter/testing/run_tests.py" + } + ] + } ] } From 9bc715f8bdd85d155af87b2add7066964670a9fb Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Thu, 17 Aug 2023 22:56:04 -0700 Subject: [PATCH 03/17] Move impeller tests to global tests. --- ci/builders/mac_host_engine.json | 43 +++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index b2ed2b32724b2..5fe49fdd3e7c3 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -158,20 +158,7 @@ "$flutter/osx_sdk": { "sdk_version": "14e300c" } - }, - "tests": [ - { - "language": "python3", - "name": "Impeller-golden, dart and engine tests for host_release", - "parameters": [ - "--variant", - "host_release", - "--type", - "dart,engine,impeller-golden" - ], - "script": "flutter/testing/run_tests.py" - } - ] + } }, { "archives": [ @@ -486,6 +473,34 @@ "script": "flutter/testing/run_tests.py" } ] + }, + { + "name": "Mac Impeller-golden, dart and engine tests for host_release", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12", + "cpu=x86" + ], + "gclient_variables": { + "download_android_deps": false + }, + "dependencies": [ + "host_release" + ], + "tasks": [ + { + "language": "python3", + "name": "Impeller-golden, dart and engine tests for host_release", + "parameters": [ + "--variant", + "host_release", + "--type", + "dart,engine,impeller-golden" + ], + "script": "flutter/testing/run_tests.py" + } + ] } ] } From a86afb281581cd94b8bcb8dc1d0868eac5ccb048 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Thu, 17 Aug 2023 23:07:06 -0700 Subject: [PATCH 04/17] Move host_profile tests to global tests. --- ci/builders/mac_host_engine.json | 45 +++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index 5fe49fdd3e7c3..4d4ab7ea71e70 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -90,21 +90,7 @@ "$flutter/osx_sdk": { "sdk_version": "14e300c" } - }, - "tests": [ - { - "language": "python3", - "name": "Host Tests for host_profile", - "parameters": [ - "--variant", - "host_profile", - "--type", - "dart,engine", - "--engine-capture-core-dump" - ], - "script": "flutter/testing/run_tests.py" - } - ] + } }, { "archives": [ @@ -501,6 +487,35 @@ "script": "flutter/testing/run_tests.py" } ] + }, + { + "name": "Mac Host Tests for host_profile", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12", + "cpu=x86" + ], + "gclient_variables": { + "download_android_deps": false + }, + "dependencies": [ + "host_profile" + ], + "tasks": [ + { + "language": "python3", + "name": "Host Tests for host_profile", + "parameters": [ + "--variant", + "host_profile", + "--type", + "dart,engine", + "--engine-capture-core-dump" + ], + "script": "flutter/testing/run_tests.py" + } + ] } ] } From 2fbc1acf7cf7eac19b08562be244c45dd10918bb Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 18 Aug 2023 08:24:18 -0700 Subject: [PATCH 05/17] Add goldctl client. --- ci/builders/mac_host_engine.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index 4d4ab7ea71e70..6d3d7155e0001 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -474,6 +474,12 @@ "dependencies": [ "host_release" ], + "test_dependencies": [ + { + "dependency": "goldctl", + "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603" + } + ], "tasks": [ { "language": "python3", From bfc19c1b3b4106b9a070396c140882cdef2b9852 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 18 Aug 2023 13:32:56 -0700 Subject: [PATCH 06/17] Set arm explicitly. --- ci/builders/mac_android_aot_engine.json | 12 ++++++------ ci/builders/mac_host_engine.json | 15 +++++++++------ ci/builders/mac_ios_engine.json | 15 ++++++++++----- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json index 20dd187c19775..b1115af5e56c9 100644 --- a/ci/builders/mac_android_aot_engine.json +++ b/ci/builders/mac_android_aot_engine.json @@ -15,7 +15,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -54,7 +54,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -94,7 +94,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -134,7 +134,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -173,7 +173,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -213,7 +213,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index 6d3d7155e0001..63153be6bb001 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -15,7 +15,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -63,7 +64,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -107,7 +109,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=arm64" ], "dependencies": [ { @@ -162,7 +165,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -209,7 +212,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -253,7 +256,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index 51ae3a9375dc2..fe69caea12ae0 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -3,7 +3,8 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=arm64" ], "gn": [ "--ios", @@ -25,7 +26,8 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=arm64" ], "gn": [ "--ios", @@ -48,7 +50,8 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=arm64" ], "gn": [ "--ios", @@ -71,7 +74,8 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=arm64" ], "gn": [ "--ios", @@ -95,7 +99,8 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=arm64" ], "gn": [ "--ios", From d804950e2933437d4257f9cfefa0ffc2e2bb7eea Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 18 Aug 2023 13:37:58 -0700 Subject: [PATCH 07/17] Update unopt. --- ci/builders/mac_unopt.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 9e11cf5817401..6d6b49cd8cca0 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -11,7 +11,8 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12" + "os=Mac-12", + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -69,7 +70,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false From 4fb53f8471c3f4a5170a124837983a61aeaf1841 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 18 Aug 2023 14:25:55 -0700 Subject: [PATCH 08/17] Move test to external test. --- ci/builders/mac_unopt.json | 81 ++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 6d6b49cd8cca0..7db0babe2019e 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -12,7 +12,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=arm64" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -33,21 +33,7 @@ "$flutter/osx_sdk": { "sdk_version": "14e300c" } - }, - "tests": [ - { - "language": "python3", - "name": "Host Tests for host_debug_unopt", - "parameters": [ - "--variant", - "host_debug_unopt", - "--type", - "dart,engine", - "--engine-capture-core-dump" - ], - "script": "flutter/testing/run_tests.py" - } - ] + } }, { "archives": [ @@ -70,7 +56,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=arm64" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -119,8 +105,7 @@ { "base_path": "out/host_debug_unopt_arm64/zip_archives/", "type": "gcs", - "include_paths": [ - ], + "include_paths": [], "name": "host_debug_unopt_arm64" } ], @@ -133,20 +118,19 @@ "download_android_deps": false }, "gn": [ - "--runtime-mode", - "debug", - "--unoptimized", - "--no-lto", - "--prebuilt-dart-sdk", - "--force-mac-arm64", - "--mac-cpu", - "arm64" + "--runtime-mode", + "debug", + "--unoptimized", + "--no-lto", + "--prebuilt-dart-sdk", + "--force-mac-arm64", + "--mac-cpu", + "arm64" ], "name": "host_debug_unopt_arm64", "ninja": { "config": "host_debug_unopt_arm64", - "targets": [ - ] + "targets": [] }, "properties": { "$flutter/osx_sdk": { @@ -159,8 +143,7 @@ { "base_path": "out/ios_debug_sim_arm64/zip_archives/", "type": "gcs", - "include_paths": [ - ], + "include_paths": [], "name": "ios_debug_sim_arm64" } ], @@ -221,7 +204,6 @@ ], "script": "flutter/testing/scenario_app/run_ios_tests.sh" } - ] }, { @@ -229,8 +211,7 @@ { "base_path": "out/ios_debug_sim_arm64_extension_safe/zip_archives/", "type": "gcs", - "include_paths": [ - ], + "include_paths": [], "name": "ios_debug_sim_arm64_extension_safe" } ], @@ -292,7 +273,37 @@ ], "script": "flutter/testing/scenario_app/run_ios_tests.sh" } - + ] + } + ], + "tests": [ + { + "name": "Mac Host Tests for host_debug_unopt", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12", + "cpu=x86" + ], + "gclient_variables": { + "download_android_deps": false + }, + "dependencies": [ + "host_debug" + ], + "tasks": [ + { + "language": "python3", + "name": "Host Tests for host_debug_unopt", + "parameters": [ + "--variant", + "host_debug_unopt", + "--type", + "dart,engine", + "--engine-capture-core-dump" + ], + "script": "flutter/testing/run_tests.py" + } ] } ] From 5ec801ce51e88bd24842dddeabde97300f4666f7 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 18 Aug 2023 14:55:40 -0700 Subject: [PATCH 09/17] Move all mac unopt tests to external tests. --- ci/builders/mac_unopt.json | 169 +++++++++++++++++++++++-------------- 1 file changed, 107 insertions(+), 62 deletions(-) diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 7db0babe2019e..c8d85264c80df 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -75,30 +75,7 @@ "flutter/testing/scenario_app", "flutter/shell/platform/darwin/ios:ios_test_flutter" ] - }, - "tests": [ - { - "language": "python3", - "name": "Tests for ios_debug_sim", - "parameters": [ - "--variant", - "ios_debug_sim", - "--type", - "objc", - "--engine-capture-core-dump", - "--ios-variant", - "ios_debug_sim" - ], - "script": "flutter/testing/run_tests.py" - }, - { - "name": "Scenario App Integration Tests", - "parameters": [ - "ios_debug_sim" - ], - "script": "flutter/testing/scenario_app/run_ios_tests.sh" - } - ] + } }, { "archives": [ @@ -181,30 +158,7 @@ "flutter/testing/scenario_app", "flutter/shell/platform/darwin/ios:ios_test_flutter" ] - }, - "tests": [ - { - "language": "python3", - "name": "Tests for ios_debug_sim_arm64", - "parameters": [ - "--variant", - "ios_debug_sim_arm64", - "--type", - "objc", - "--engine-capture-core-dump", - "--ios-variant", - "ios_debug_sim_arm64" - ], - "script": "flutter/testing/run_tests.py" - }, - { - "name": "Scenario App Integration Tests", - "parameters": [ - "ios_debug_sim_arm64" - ], - "script": "flutter/testing/scenario_app/run_ios_tests.sh" - } - ] + } }, { "archives": [ @@ -250,59 +204,150 @@ "flutter/testing/scenario_app", "flutter/shell/platform/darwin/ios:ios_test_flutter" ] + } + } + ], + "tests": [ + { + "name": "Mac Host Tests for host_debug_unopt", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12", + "cpu=arm64" + ], + "gclient_variables": { + "download_android_deps": false + }, + "dependencies": [ + "host_debug_unopt" + ], + "tasks": [ + { + "language": "python3", + "name": "Host Tests for host_debug_unopt", + "parameters": [ + "--variant", + "host_debug_unopt", + "--type", + "dart,engine", + "--engine-capture-core-dump" + ], + "script": "flutter/testing/run_tests.py" + } + ] + }, + { + "name": "Mac Tests for ios_debug_sim", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12", + "cpu=arm64" + ], + "gclient_variables": { + "download_android_deps": false }, + "dependencies": [ + "ios_debug_sim" + ], "tests": [ { "language": "python3", - "name": "Tests for ios_debug_sim_arm64_extension_safe", + "name": "Tests for ios_debug_sim", "parameters": [ "--variant", - "ios_debug_sim_arm64_extension_safe", + "ios_debug_sim", "--type", "objc", "--engine-capture-core-dump", "--ios-variant", - "ios_debug_sim_arm64_extension_safe" + "ios_debug_sim" ], "script": "flutter/testing/run_tests.py" }, { "name": "Scenario App Integration Tests", "parameters": [ - "ios_debug_sim_arm64_extension_safe" + "ios_debug_sim" ], "script": "flutter/testing/scenario_app/run_ios_tests.sh" } ] - } - ], - "tests": [ + }, { - "name": "Mac Host Tests for host_debug_unopt", + "name": "Mac Tests for ios_debug_sim_arm64", "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false }, "dependencies": [ - "host_debug" + "ios_debug_sim_arm64" ], "tasks": [ { "language": "python3", - "name": "Host Tests for host_debug_unopt", + "name": "Tests for ios_debug_sim_arm64", "parameters": [ "--variant", - "host_debug_unopt", + "ios_debug_sim_arm64", "--type", - "dart,engine", - "--engine-capture-core-dump" + "objc", + "--engine-capture-core-dump", + "--ios-variant", + "ios_debug_sim_arm64" + ], + "script": "flutter/testing/run_tests.py" + }, + { + "name": "Scenario App Integration Tests", + "parameters": [ + "ios_debug_sim_arm64" + ], + "script": "flutter/testing/scenario_app/run_ios_tests.sh" + } + ] + }, + { + "name": "Mac Tests for ios_debug_sim_arm64_extension_safe", + "recipe": "engine_v2/tester_engine", + "drone_dimensions": [ + "device_type=none", + "os=Mac-12", + "cpu=arm64" + ], + "gclient_variables": { + "download_android_deps": false + }, + "dependencies": [ + "ios_debug_sim_arm64_extension_safe" + ], + "tests": [ + { + "language": "python3", + "name": "Tests for ios_debug_sim_arm64_extension_safe", + "parameters": [ + "--variant", + "ios_debug_sim_arm64_extension_safe", + "--type", + "objc", + "--engine-capture-core-dump", + "--ios-variant", + "ios_debug_sim_arm64_extension_safe" ], "script": "flutter/testing/run_tests.py" + }, + { + "name": "Scenario App Integration Tests", + "parameters": [ + "ios_debug_sim_arm64_extension_safe" + ], + "script": "flutter/testing/scenario_app/run_ios_tests.sh" } ] } From f833f85a113370ad57305f7dd1f7cfd37d2ce98c Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 18 Aug 2023 15:16:51 -0700 Subject: [PATCH 10/17] Use x86 for ios_debug_sim_arm64 test. --- ci/builders/mac_unopt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index c8d85264c80df..4349834ba2292 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -281,7 +281,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=arm64" + "cpu=x86" ], "gclient_variables": { "download_android_deps": false From b3fc843178de825360282ac4e05ebd1d23508852 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 18 Aug 2023 15:53:26 -0700 Subject: [PATCH 11/17] Add osx_sdk context. --- ci/builders/mac_unopt.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 4349834ba2292..59054d4d0c8a7 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -281,7 +281,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false @@ -289,6 +289,9 @@ "dependencies": [ "ios_debug_sim_arm64" ], + "contexts": [ + "osx_sdk" + ], "tasks": [ { "language": "python3", From 4d4bd6e2b0c7f26aabcf4dac90884ae1da6f3959 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 18 Aug 2023 17:20:37 -0700 Subject: [PATCH 12/17] Use x64 in simulator test. --- ci/builders/mac_unopt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 59054d4d0c8a7..e70ee3dc6a2b1 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -281,7 +281,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=arm64" + "cpu=x86" ], "gclient_variables": { "download_android_deps": false From 84d75e778521cef1ce07651526d94c7fc2a2fe41 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 18 Aug 2023 18:27:10 -0700 Subject: [PATCH 13/17] Add properties for osx_sdk context. --- ci/builders/mac_unopt.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index e70ee3dc6a2b1..94dc120f2e72d 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -292,6 +292,15 @@ "contexts": [ "osx_sdk" ], + "properties": { + "$flutter/osx_sdk": { + "runtime_versions": [ + "ios-16-4_14e300c", + "ios-16-2_14c18" + ], + "sdk_version": "14e300c" + } + }, "tasks": [ { "language": "python3", From d23150983e318f131eed40f900a26ac57e90bb95 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 18 Aug 2023 18:49:34 -0700 Subject: [PATCH 14/17] Run test on arm64 --- ci/builders/mac_unopt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 94dc120f2e72d..3b9f6008bda1e 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -281,7 +281,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=x86" + "cpu=arm64" ], "gclient_variables": { "download_android_deps": false From 02e1e1049fccac233f614588f35e8bfcf7992275 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 18 Aug 2023 20:02:15 -0700 Subject: [PATCH 15/17] Build with x86 and test with arm64. --- ci/builders/mac_unopt.json | 45 ++------------------------------------ 1 file changed, 2 insertions(+), 43 deletions(-) diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 3b9f6008bda1e..05852351782e8 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -1,14 +1,6 @@ { "builds": [ { - "archives": [ - { - "base_path": "out/host_debug_unopt/zip_archives/", - "type": "gcs", - "include_paths": [], - "name": "host_debug_unopt" - } - ], "drone_dimensions": [ "device_type=none", "os=Mac-12", @@ -36,14 +28,6 @@ } }, { - "archives": [ - { - "base_path": "out/ios_debug_sim/zip_archives/", - "type": "gcs", - "include_paths": [], - "name": "ios_debug_sim" - } - ], "properties": { "$flutter/osx_sdk": { "runtime_versions": [ @@ -56,7 +40,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=arm64" + "cpu=x86" ], "gclient_variables": { "download_android_deps": false @@ -78,14 +62,6 @@ } }, { - "archives": [ - { - "base_path": "out/host_debug_unopt_arm64/zip_archives/", - "type": "gcs", - "include_paths": [], - "name": "host_debug_unopt_arm64" - } - ], "drone_dimensions": [ "device_type=none", "os=Mac-12", @@ -106,8 +82,7 @@ ], "name": "host_debug_unopt_arm64", "ninja": { - "config": "host_debug_unopt_arm64", - "targets": [] + "config": "host_debug_unopt_arm64" }, "properties": { "$flutter/osx_sdk": { @@ -116,14 +91,6 @@ } }, { - "archives": [ - { - "base_path": "out/ios_debug_sim_arm64/zip_archives/", - "type": "gcs", - "include_paths": [], - "name": "ios_debug_sim_arm64" - } - ], "properties": { "$flutter/osx_sdk": { "runtime_versions": [ @@ -161,14 +128,6 @@ } }, { - "archives": [ - { - "base_path": "out/ios_debug_sim_arm64_extension_safe/zip_archives/", - "type": "gcs", - "include_paths": [], - "name": "ios_debug_sim_arm64_extension_safe" - } - ], "properties": { "$flutter/osx_sdk": { "runtime_versions": [ From 93717f559bff437fbcfaa83dd78e2b12791ee315 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 18 Aug 2023 22:12:18 -0700 Subject: [PATCH 16/17] X64 artifacts with arm64 tests. --- ci/builders/mac_unopt.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 05852351782e8..a2da70be8ef79 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -103,7 +103,7 @@ "drone_dimensions": [ "device_type=none", "os=Mac-12", - "cpu=arm64" + "cpu=x86" ], "gclient_variables": { "download_android_deps": false From 21078da2ca5ed855444258a8cb4875225200a881 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Mon, 21 Aug 2023 11:10:38 -0700 Subject: [PATCH 17/17] Remove arm64 and or x64 dimensions. --- ci/builders/mac_android_aot_engine.json | 18 ++++++----------- ci/builders/mac_host_engine.json | 18 ++++++----------- ci/builders/mac_ios_engine.json | 15 +++++--------- ci/builders/mac_unopt.json | 27 +++++++++---------------- 4 files changed, 26 insertions(+), 52 deletions(-) diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json index b1115af5e56c9..ecf59f5fb6070 100644 --- a/ci/builders/mac_android_aot_engine.json +++ b/ci/builders/mac_android_aot_engine.json @@ -14,8 +14,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -53,8 +52,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -93,8 +91,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -133,8 +130,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -172,8 +168,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -212,8 +207,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index 63153be6bb001..87b3f48e0a0cf 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -15,8 +15,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -64,8 +63,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -109,8 +107,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "dependencies": [ { @@ -164,8 +161,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -211,8 +207,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -255,8 +250,7 @@ ], "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index fe69caea12ae0..51ae3a9375dc2 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -3,8 +3,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gn": [ "--ios", @@ -26,8 +25,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gn": [ "--ios", @@ -50,8 +48,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gn": [ "--ios", @@ -74,8 +71,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gn": [ "--ios", @@ -99,8 +95,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gn": [ "--ios", diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index a2da70be8ef79..b6f5fc25881bf 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -3,8 +3,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -39,8 +38,7 @@ }, "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -64,8 +62,7 @@ { "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -102,8 +99,7 @@ }, "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=x86" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -139,8 +135,7 @@ }, "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -172,8 +167,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -201,8 +195,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -239,8 +232,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false @@ -289,8 +281,7 @@ "recipe": "engine_v2/tester_engine", "drone_dimensions": [ "device_type=none", - "os=Mac-12", - "cpu=arm64" + "os=Mac-12" ], "gclient_variables": { "download_android_deps": false