From acf50362202cdd1241e0b24d11e6a40cabf418a7 Mon Sep 17 00:00:00 2001 From: Dongdong Zhou Date: Tue, 4 Jun 2024 18:34:19 +0100 Subject: [PATCH] update --- .github/workflows/release-test-macos.yml | 10 +--------- Makefile | 4 +--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release-test-macos.yml b/.github/workflows/release-test-macos.yml index 1080f17f3d..b6d2d672b8 100644 --- a/.github/workflows/release-test-macos.yml +++ b/.github/workflows/release-test-macos.yml @@ -22,10 +22,6 @@ jobs: - rust-arch: aarch64 darwin-arch: arm64 runs-on: macos-14 - - - rust-arch: x86_64 - darwin-arch: x86_64 - runs-on: macos-13 env: RELEASE_TAG_NAME: ${{ needs.tagname.outputs.tag_name }} @@ -51,12 +47,8 @@ jobs: - name: Fetch dependencies run: cargo fetch --locked - - name: arm64 - if: matrix.rust-arch == 'aarch64' - run: echo 'MACOSX_DEPLOYMENT_TARGET=11.0' >> $GITHUB_ENV - - name: Make DMG - run: make dmg + run: make dmg-universal - name: Rename run: | diff --git a/Makefile b/Makefile index 2fec707a2e..21b4f40f28 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,6 @@ CODESIGN_IDENTITY = FAC8FBEA99169DC1980731029648F110628D6A32 ASSETS_DIR = extra RELEASE_DIR = target/release-lto -MACOSX_DEPLOYMENT_TARGET ?= 10.11 - APP_NAME = Lapce.app APP_TEMPLATE = $(ASSETS_DIR)/macos/$(APP_NAME) APP_DIR = $(RELEASE_DIR)/macos @@ -36,7 +34,7 @@ $(TARGET)-native: cargo build --profile release-lto @lipo target/release-lto/$(TARGET) -create -output $(APP_BINARY) $(TARGET)-universal: - MACOSX_DEPLOYMENT_TARGET="10.11" cargo build --profile release-lto --target=x86_64-apple-darwin + MACOSX_DEPLOYMENT_TARGET="11.0" cargo build --profile release-lto --target=x86_64-apple-darwin MACOSX_DEPLOYMENT_TARGET="11.0" cargo build --profile release-lto --target=aarch64-apple-darwin @lipo target/{x86_64,aarch64}-apple-darwin/release-lto/$(TARGET) -create -output $(APP_BINARY) /usr/bin/codesign -vvv --deep --entitlements $(ASSETS_DIR)/entitlements.plist --strict --options=runtime --force -s $(CODESIGN_IDENTITY) $(APP_BINARY)