From e7a5edcbfd21d64a2f0ba09b48a6f97224cba2be Mon Sep 17 00:00:00 2001 From: Bryan Oltman Date: Thu, 8 Jun 2023 13:44:38 -0400 Subject: [PATCH] fix(shorebird_cli): use aarch64 instead of arm64 as iOS architecture (#609) --- .../lib/src/commands/patch/patch_ios_command.dart | 5 +++-- .../test/src/commands/patch/patch_ios_command_test.dart | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/shorebird_cli/lib/src/commands/patch/patch_ios_command.dart b/packages/shorebird_cli/lib/src/commands/patch/patch_ios_command.dart index e12cc823..4aa84e03 100644 --- a/packages/shorebird_cli/lib/src/commands/patch/patch_ios_command.dart +++ b/packages/shorebird_cli/lib/src/commands/patch/patch_ios_command.dart @@ -84,6 +84,7 @@ class PatchIosCommand extends ShorebirdCommand '''iOS support is in an experimental state and will not work without Flutter engine changes that have not yet been published.''', ); + const arch = 'aarch64'; const channelName = 'stable'; const platform = 'ios'; final force = results['force'] == true; @@ -201,7 +202,7 @@ https://github.com/shorebirdtech/shorebird/issues/472 if (flavor != null) '🍧 Flavor: ${lightCyan.wrap(flavor)}', 'đŸ“Ļ Release Version: ${lightCyan.wrap(releaseVersion)}', 'đŸ“ē Channel: ${lightCyan.wrap(channelName)}', - '''đŸ•šī¸ Platform: ${lightCyan.wrap(platform)} ${lightCyan.wrap('[arm64 (${formatBytes(aotFileSize)})]')}''', + '''đŸ•šī¸ Platform: ${lightCyan.wrap(platform)} ${lightCyan.wrap('[$arch (${formatBytes(aotFileSize)})]')}''', ]; logger.info( @@ -232,7 +233,7 @@ ${summary.join('\n')} channelName: channelName, patchArtifactBundles: { Arch.arm64: PatchArtifactBundle( - arch: 'arm64', + arch: arch, path: aotFile.path, hash: _hashFn(aotFile.readAsBytesSync()), size: aotFileSize, diff --git a/packages/shorebird_cli/test/src/commands/patch/patch_ios_command_test.dart b/packages/shorebird_cli/test/src/commands/patch/patch_ios_command_test.dart index 5b553c33..e57e6c82 100644 --- a/packages/shorebird_cli/test/src/commands/patch/patch_ios_command_test.dart +++ b/packages/shorebird_cli/test/src/commands/patch/patch_ios_command_test.dart @@ -405,7 +405,7 @@ https://github.com/shorebirdtech/shorebird/issues/472 () => logger.info( any( that: contains( - '''đŸ•šī¸ Platform: ${lightCyan.wrap(platform)} ${lightCyan.wrap('[arm64 (0 B)]')}''', + '''đŸ•šī¸ Platform: ${lightCyan.wrap(platform)} ${lightCyan.wrap('[aarch64 (0 B)]')}''', ), ), ),