Skip to content

Commit 14b0126

Browse files
committed
feat: native support for m1 mac
1 parent 7cb9ec3 commit 14b0126

File tree

5 files changed

+17
-9
lines changed

5 files changed

+17
-9
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- os: ubuntu-latest
1919
flutter_profile: development-linux-x86
2020
- os: macos-latest
21-
flutter_profile: development-mac
21+
flutter_profile: development-mac-x86_64
2222
runs-on: ${{ matrix.os }}
2323

2424
steps:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
working-directory: frontend
114114
run: |
115115
flutter config --enable-macos-desktop
116-
cargo make --env APP_VERSION=${{ github.ref_name }} --profile production-mac-x86 appflowy
116+
cargo make --env APP_VERSION=${{ github.ref_name }} --profile production-mac-x86_64 appflowy
117117
118118
- name: Archive macOS app
119119
working-directory: ${{ env.MACOS_APP_RELEASE_PATH }}

frontend/Makefile.toml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,31 @@ APP_ENVIRONMENT = "local"
4545
FLUTTER_FLOWY_SDK_PATH="app_flowy/packages/flowy_sdk"
4646
PROTOBUF_DERIVE_CACHE="../shared-lib/flowy-derive/src/derive_cache/derive_cache.rs"
4747

48-
[env.development-mac]
48+
[env.development-mac-arm64]
49+
RUST_LOG = "info"
50+
TARGET_OS = "macos"
51+
RUST_COMPILE_TARGET = "aarch64-apple-darwin"
52+
BUILD_FLAG = "debug"
53+
FLUTTER_OUTPUT_DIR = "Debug"
54+
PRODUCT_EXT = "app"
55+
56+
[env.development-mac-x86_64]
4957
RUST_LOG = "info"
5058
TARGET_OS = "macos"
5159
RUST_COMPILE_TARGET = "x86_64-apple-darwin"
5260
BUILD_FLAG = "debug"
5361
FLUTTER_OUTPUT_DIR = "Debug"
5462
PRODUCT_EXT = "app"
5563

56-
[env.production-mac-aarch64]
64+
[env.production-mac-arm64]
5765
BUILD_FLAG = "release"
5866
TARGET_OS = "macos"
5967
RUST_COMPILE_TARGET = "aarch64-apple-darwin"
6068
FLUTTER_OUTPUT_DIR = "Release"
6169
PRODUCT_EXT = "app"
6270
APP_ENVIRONMENT = "production"
6371

64-
[env.production-mac-x86]
72+
[env.production-mac-x86_64]
6573
BUILD_FLAG = "release"
6674
TARGET_OS = "macos"
6775
RUST_COMPILE_TARGET = "x86_64-apple-darwin"

frontend/app_flowy/macos/Runner.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@
421421
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
422422
CODE_SIGN_STYLE = Automatic;
423423
COMBINE_HIDPI_IMAGES = YES;
424-
EXCLUDED_ARCHS = arm64;
424+
EXCLUDED_ARCHS = "";
425425
INFOPLIST_FILE = Runner/Info.plist;
426426
LD_RUNPATH_SEARCH_PATHS = (
427427
"$(inherited)",
@@ -553,7 +553,7 @@
553553
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
554554
CODE_SIGN_STYLE = Automatic;
555555
COMBINE_HIDPI_IMAGES = YES;
556-
EXCLUDED_ARCHS = arm64;
556+
EXCLUDED_ARCHS = "";
557557
INFOPLIST_FILE = Runner/Info.plist;
558558
LD_RUNPATH_SEARCH_PATHS = (
559559
"$(inherited)",
@@ -577,7 +577,7 @@
577577
CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
578578
CODE_SIGN_STYLE = Automatic;
579579
COMBINE_HIDPI_IMAGES = YES;
580-
EXCLUDED_ARCHS = arm64;
580+
EXCLUDED_ARCHS = "";
581581
INFOPLIST_FILE = Runner/Info.plist;
582582
LD_RUNPATH_SEARCH_PATHS = (
583583
"$(inherited)",

frontend/scripts/build_sdk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Linux-x86)
2525
;;
2626

2727
macOS)
28-
cargo make --profile development-mac flowy-sdk-dev
28+
cargo make --profile "development-mac-$(uname -m)" flowy-sdk-dev
2929
;;
3030

3131
Windows)

0 commit comments

Comments
 (0)