From 5e3d3c0f0e8999ca9699e5a06d8e51620ca904b3 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Mon, 11 Sep 2023 13:20:58 -0700 Subject: [PATCH 1/2] upload extension safe artifacts fix fix fix fiox --- ci/builders/mac_ios_engine.json | 193 ++++++++++++++++++++++++++++++++ tools/gn_test.py | 2 + 2 files changed, 195 insertions(+) diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index 20f687338cc72..888152e872821 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -116,6 +116,132 @@ "sdk_version": "14e300c" } } + }, + { + "drone_dimensions": [ + "device_type=none", + "mac_model=Macmini8,1", + "os=Mac-12" + ], + "gn": [ + "--ios", + "--runtime-mode", + "debug", + "--simulator", + "--no-lto", + "--darwin-extension-safe" + ], + "name": "ios_debug_sim_extension_safe", + "ninja": { + "config": "ios_debug_sim_extension_safe" + }, + "properties": { + "$flutter/osx_sdk": { + "sdk_version": "14e300c" + } + } + }, + { + "drone_dimensions": [ + "device_type=none", + "mac_model=Macmini8,1", + "os=Mac-12" + ], + "gn": [ + "--ios", + "--runtime-mode", + "debug", + "--simulator", + "--simulator-cpu=arm64", + "--no-lto", + "--darwin-extension-safe" + ], + "name": "ios_debug_sim_arm64_extension_safe", + "ninja": { + "config": "ios_debug_sim_arm64_extension_safe" + }, + "properties": { + "$flutter/osx_sdk": { + "sdk_version": "14e300c" + } + } + }, + { + "drone_dimensions": [ + "device_type=none", + "mac_model=Macmini8,1", + "os=Mac-12" + ], + "gn": [ + "--ios", + "--runtime-mode", + "debug", + "--darwin-extension-safe" + ], + "name": "ios_debug_extension_safe", + "ninja": { + "config": "ios_debug_extension_safe", + "targets": [ + "flutter/shell/platform/darwin/ios:flutter_framework" + ] + }, + "properties": { + "$flutter/osx_sdk": { + "sdk_version": "14e300c" + } + } + }, + { + "drone_dimensions": [ + "device_type=none", + "mac_model=Macmini8,1", + "os=Mac-12" + ], + "gn": [ + "--ios", + "--runtime-mode", + "profile", + "--darwin-extension-safe" + ], + "name": "ios_profile_extension_safe", + "ninja": { + "config": "ios_profile_extension_safe", + "targets": [ + "flutter/shell/platform/darwin/ios:flutter_framework", + "flutter/lib/snapshot:generate_snapshot_bin" + ] + }, + "properties": { + "$flutter/osx_sdk": { + "sdk_version": "14e300c" + } + } + }, + { + "drone_dimensions": [ + "device_type=none", + "mac_model=Macmini8,1", + "os=Mac-12" + ], + "gn": [ + "--ios", + "--runtime-mode", + "release", + "--darwin-extension-safe" + ], + "name": "ios_release_extension_safe", + "ninja": { + "config": "ios_release_extension_safe", + "targets": [ + "flutter/shell/platform/darwin/ios:flutter_framework", + "flutter/lib/snapshot:generate_snapshot_bin" + ] + }, + "properties": { + "$flutter/osx_sdk": { + "sdk_version": "14e300c" + } + } } ], "generators": { @@ -167,6 +293,53 @@ "script": "flutter/sky/tools/create_full_ios_framework.py", "language": "python3" }, + { + "name": "Debug-ios-Flutter-Extension-Safe.xcframework", + "parameters": [ + "--dst", + "out/debug_extension_safe", + "--arm64-out-dir", + "out/ios_debug_extension_safe", + "--simulator-x64-out-dir", + "out/ios_debug_sim_extension_safe", + "--simulator-arm64-out-dir", + "out/ios_debug_sim_arm64_extension_safe" + ], + "script": "flutter/sky/tools/create_full_ios_framework.py", + "language": "python3" + }, + { + "name": "Profile-ios-Flutter-Extension-Safe.xcframework", + "parameters": [ + "--dst", + "out/profile_extension_safe", + "--arm64-out-dir", + "out/ios_profile_extension_safe", + "--simulator-x64-out-dir", + "out/ios_debug_sim_extension_safe", + "--simulator-arm64-out-dir", + "out/ios_debug_sim_arm64_extension_safe" + ], + "script": "flutter/sky/tools/create_full_ios_framework.py", + "language": "python3" + }, + { + "name": "Release-ios-Flutter-Extension-Safe.xcframework", + "parameters": [ + "--dst", + "out/release_extension_safe", + "--arm64-out-dir", + "out/ios_release_extension_safe", + "--simulator-x64-out-dir", + "out/ios_debug_sim_extension_safe", + "--simulator-arm64-out-dir", + "out/ios_debug_sim_arm64_extension_safe", + "--dsym", + "--strip" + ], + "script": "flutter/sky/tools/create_full_ios_framework.py", + "language": "python3" + }, { "name": "Release-macos-gen-snapshots", "parameters": [ @@ -208,6 +381,26 @@ "source": "out/release/Flutter.dSYM.zip", "destination": "ios-release/Flutter.dSYM.zip", "realm": "production" + }, + { + "source": "out/debug_extension_safe/artifacts.zip", + "destination": "ios-extension-safe/artifacts.zip", + "realm": "production" + }, + { + "source": "out/profile_extension_safe/artifacts.zip", + "destination": "ios-profile-extension-safe/artifacts.zip", + "realm": "production" + }, + { + "source": "out/release_extension_safe/artifacts.zip", + "destination": "ios-release-extension-safe/artifacts.zip", + "realm": "production" + }, + { + "source": "out/release_extension_safe/Flutter.dSYM.zip", + "destination": "ios-release-extension-safe/Flutter.dSYM.zip", + "realm": "production" } ] } diff --git a/tools/gn_test.py b/tools/gn_test.py index 9e623e1e86b3e..6a5607fef7dbb 100644 --- a/tools/gn_test.py +++ b/tools/gn_test.py @@ -20,7 +20,9 @@ def test_get_out_dir(self): self._expect_build_dir(['--debug'], 'out/Debug') self._expect_build_dir(['--release'], 'out/Release') self._expect_build_dir(['--ios'], 'out/ios_Debug') + self._expect_build_dir(['--ios'], 'out/ios_Debug_extension_safe') self._expect_build_dir(['--ios', '--release'], 'out/ios_Release') + self._expect_build_dir(['--ios'], 'out/ios_Release_extension_safe') self._expect_build_dir(['--android'], 'out/android_Debug') self._expect_build_dir(['--android', '--release'], 'out/android_Release') From dcea5487b41de74f454ed9fbce3080e2b6c94740 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Tue, 12 Sep 2023 11:49:33 -0700 Subject: [PATCH 2/2] move arm jobs to arm machines --- ci/builders/mac_ios_engine.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index 888152e872821..a8a4bb926462e 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -144,7 +144,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -169,7 +168,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -194,7 +192,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [ @@ -220,7 +217,6 @@ { "drone_dimensions": [ "device_type=none", - "mac_model=Macmini8,1", "os=Mac-12" ], "gn": [