From 14b012686bf31e933b5c68e69099565d9a9730a3 Mon Sep 17 00:00:00 2001 From: Vincent Chan Date: Mon, 30 May 2022 20:48:28 +0800 Subject: [PATCH] feat: native support for m1 mac --- .github/workflows/ci.yaml | 2 +- .github/workflows/release.yml | 2 +- frontend/Makefile.toml | 14 +++++++++++--- .../macos/Runner.xcodeproj/project.pbxproj | 6 +++--- frontend/scripts/build_sdk.sh | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ab1becf24f..d3dd050e2c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,7 +18,7 @@ jobs: - os: ubuntu-latest flutter_profile: development-linux-x86 - os: macos-latest - flutter_profile: development-mac + flutter_profile: development-mac-x86_64 runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d500c4659..a2c9c7b133 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -113,7 +113,7 @@ jobs: working-directory: frontend run: | flutter config --enable-macos-desktop - cargo make --env APP_VERSION=${{ github.ref_name }} --profile production-mac-x86 appflowy + cargo make --env APP_VERSION=${{ github.ref_name }} --profile production-mac-x86_64 appflowy - name: Archive macOS app working-directory: ${{ env.MACOS_APP_RELEASE_PATH }} diff --git a/frontend/Makefile.toml b/frontend/Makefile.toml index c46687a2df..0dbc58d572 100644 --- a/frontend/Makefile.toml +++ b/frontend/Makefile.toml @@ -45,7 +45,15 @@ APP_ENVIRONMENT = "local" FLUTTER_FLOWY_SDK_PATH="app_flowy/packages/flowy_sdk" PROTOBUF_DERIVE_CACHE="../shared-lib/flowy-derive/src/derive_cache/derive_cache.rs" -[env.development-mac] +[env.development-mac-arm64] +RUST_LOG = "info" +TARGET_OS = "macos" +RUST_COMPILE_TARGET = "aarch64-apple-darwin" +BUILD_FLAG = "debug" +FLUTTER_OUTPUT_DIR = "Debug" +PRODUCT_EXT = "app" + +[env.development-mac-x86_64] RUST_LOG = "info" TARGET_OS = "macos" RUST_COMPILE_TARGET = "x86_64-apple-darwin" @@ -53,7 +61,7 @@ BUILD_FLAG = "debug" FLUTTER_OUTPUT_DIR = "Debug" PRODUCT_EXT = "app" -[env.production-mac-aarch64] +[env.production-mac-arm64] BUILD_FLAG = "release" TARGET_OS = "macos" RUST_COMPILE_TARGET = "aarch64-apple-darwin" @@ -61,7 +69,7 @@ FLUTTER_OUTPUT_DIR = "Release" PRODUCT_EXT = "app" APP_ENVIRONMENT = "production" -[env.production-mac-x86] +[env.production-mac-x86_64] BUILD_FLAG = "release" TARGET_OS = "macos" RUST_COMPILE_TARGET = "x86_64-apple-darwin" diff --git a/frontend/app_flowy/macos/Runner.xcodeproj/project.pbxproj b/frontend/app_flowy/macos/Runner.xcodeproj/project.pbxproj index 2e7ab66fee..61cb05b101 100644 --- a/frontend/app_flowy/macos/Runner.xcodeproj/project.pbxproj +++ b/frontend/app_flowy/macos/Runner.xcodeproj/project.pbxproj @@ -421,7 +421,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - EXCLUDED_ARCHS = arm64; + EXCLUDED_ARCHS = ""; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -553,7 +553,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - EXCLUDED_ARCHS = arm64; + EXCLUDED_ARCHS = ""; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -577,7 +577,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - EXCLUDED_ARCHS = arm64; + EXCLUDED_ARCHS = ""; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/frontend/scripts/build_sdk.sh b/frontend/scripts/build_sdk.sh index 061fa58d0a..330bd22738 100755 --- a/frontend/scripts/build_sdk.sh +++ b/frontend/scripts/build_sdk.sh @@ -25,7 +25,7 @@ Linux-x86) ;; macOS) - cargo make --profile development-mac flowy-sdk-dev + cargo make --profile "development-mac-$(uname -m)" flowy-sdk-dev ;; Windows)