From 4ca3154b362bda5cd33f501d465a1f5289b8eaf3 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Tue, 18 Apr 2023 12:28:56 -0700 Subject: [PATCH 1/2] Double zip FlutterMacOS.framework.zip. This is required to make the artifact consistent with the legacy artifacts while the tool is modified to remove the need of double zipping. Bug: https://github.com/flutter/flutter/issues/124911 --- sky/tools/create_macos_framework.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sky/tools/create_macos_framework.py b/sky/tools/create_macos_framework.py index 8f7a34c19d486..fa991a6bab417 100755 --- a/sky/tools/create_macos_framework.py +++ b/sky/tools/create_macos_framework.py @@ -172,6 +172,18 @@ def process_framework(dst, args, fat_framework, fat_framework_binary): 'without_entitlements.txt', ], cwd=dst) + # Double zip to make it consistent with legacy artifacts. + subprocess.check_call([ + 'zip', + '-y', + 'FlutterMacOS.framework_.zip', + 'FlutterMacOS.framework.zip', + ], + cwd=dst) + # Use doubled zipped file. + final_src_path = os.path.join(dst, 'FlutterMacOS.framework_.zip') + final_dst_path = os.path.join(dst, 'FlutterMacOS.framework.zip') + shutil.move(final_src_path, final_dst_path) if __name__ == '__main__': From 125c35e19a49715f7d779c9080fdc84f07b3ed93 Mon Sep 17 00:00:00 2001 From: godofredoc Date: Tue, 18 Apr 2023 15:25:27 -0700 Subject: [PATCH 2/2] Update sky/tools/create_macos_framework.py Co-authored-by: Christopher Fujino --- sky/tools/create_macos_framework.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sky/tools/create_macos_framework.py b/sky/tools/create_macos_framework.py index fa991a6bab417..8e194ebbe6907 100755 --- a/sky/tools/create_macos_framework.py +++ b/sky/tools/create_macos_framework.py @@ -173,6 +173,7 @@ def process_framework(dst, args, fat_framework, fat_framework_binary): ], cwd=dst) # Double zip to make it consistent with legacy artifacts. + # TODO(fujino): remove this once https://github.com/flutter/flutter/issues/125067 is resolved subprocess.check_call([ 'zip', '-y',