From 53a0b68de189c16e3c50398b537bb9b4ad07858b Mon Sep 17 00:00:00 2001 From: Hiddify <114227601+hiddify1@users.noreply.github.com> Date: Sun, 20 Aug 2023 10:03:29 +0000 Subject: [PATCH] chg: add x64 to the name --- .github/workflows/ci.yml | 23 +++++++++++++---------- Makefile | 12 ++++++------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17423d2a..a90fae7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,11 +25,12 @@ jobs: aarch: amd64 targets: exe target: windows-x64 - - platform: windows - os: windows-latest - aarch: 386 - targets: exe - target: windows-x86 + + # - platform: windows + # os: windows-latest + # aarch: 386 + # targets: exe + # target: windows-x86 # - platform: linux # os: ubuntu-latest @@ -40,17 +41,19 @@ jobs: os: macos-11 aarch: universal targets: dmg + target: macos-universal - platform: linux os: ubuntu-latest aarch: amd64 targets: AppImage target: linux-x64 - - platform: linux - os: ubuntu-latest - aarch: 386 - targets: AppImage - target: linux-x86 + + # - platform: linux + # os: ubuntu-latest + # aarch: 386 + # targets: AppImage + # target: linux-x86 runs-on: ${{ matrix.os }} steps: diff --git a/Makefile b/Makefile index ddc7ad8b..edfa3d23 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,13 @@ translate: android-release: flutter build apk --target-platform android-arm,android-arm64,android-x64 --split-per-abi -windows-release: +windows-x64-release: flutter_distributor package --platform windows --targets exe -linux-release: +linux-x64-release: flutter_distributor package --platform linux --targets appimage -macos-realase: +macos-universal-release: flutter build macos --release &&\ tree ./build/macos/Build &&\ create-dmg --app-drop-link 600 185 "hiddify-amd64.dmg" ./build/macos/Build/Products/Release/hiddify-clash.app @@ -31,15 +31,15 @@ android-libs: mkdir -p $(ANDROID_OUT) curl -L $(LIBS_DOWNLOAD_URL)/hiddify-libcore-android.aar.gz | gunzip > $(ANDROID_OUT)/libcore.aar -windows-libs: +windows-x64-libs: mkdir -p $(DESKTOP_OUT) curl -L $(LIBS_DOWNLOAD_URL)/hiddify-libcore-windows-amd64.dll.gz | gunzip > $(DESKTOP_OUT)/libcore.dll -linux-libs: +linux-x64-libs: mkdir -p $(DESKTOP_OUT) curl -L $(LIBS_DOWNLOAD_URL)/hiddify-libcore-linux-amd64.so.gz | gunzip > $(DESKTOP_OUT)/libcore.so -macos-libs: +macos-universal-libs: mkdir -p $(DESKTOP_OUT)/ &&\ curl -L $(LIBS_DOWNLOAD_URL)/hiddify-libcore-macos-universal.dylib.gz | gunzip > $(DESKTOP_OUT)/libcore.dylib