From c26143abf1a5b24db7bf69031ed41c6176623d21 Mon Sep 17 00:00:00 2001
From: Hiddify <114227601+hiddify1@users.noreply.github.com>
Date: Sun, 20 Aug 2023 12:05:11 +0000
Subject: [PATCH] return: build for all

---
 .github/workflows/ci.yml | 33 +++++++++++++++++++--------------
 Makefile                 |  3 +++
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 49a45c3e..7f6ae312 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,15 +15,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # - platform: android
-          #   os: ubuntu-latest
-          #   targets: aab,apk
-          #   target: android
+          - platform: android
+            os: ubuntu-latest
+            targets: apk
 
-          # - platform: windows
-          #   os: windows-latest
-          #   aarch: amd64
-          #   targets: exe
+          # - platform: android-aab
+          #   os: ubuntu-latest
+          #   targets: aab
+
+          - platform: windows
+            os: windows-latest
+            aarch: amd64
+            targets: exe
 
           # Flutter does not support x86
           # - platform: windows 
@@ -44,10 +47,10 @@ jobs:
             targets: dmg
 
 
-          # - platform: linux
-          #   os: ubuntu-latest
-          #   aarch: amd64
-          #   targets: AppImage
+          - platform: linux
+            os: ubuntu-latest
+            aarch: amd64
+            targets: AppImage
 
 
     runs-on: ${{ matrix.os }}
@@ -78,7 +81,7 @@ jobs:
           npm install -g appdmg
 
       - name: Setup Java
-        if: matrix.platform == 'android'
+        if: startsWith(matrix.platform,'android')
         uses: actions/setup-java@v3
         with:
           distribution: "zulu"
@@ -95,7 +98,7 @@ jobs:
           mv appimagetool /usr/local/bin/
 
       - name: Setup Flutter Distributor
-        if: matrix.platform != 'android' 
+        if: ${{ !startsWith(matrix.platform,'android') }} 
 #         shell: powershell
         run: |
           dart pub global activate flutter_distributor
@@ -151,7 +154,9 @@ jobs:
           mv out/*arm64-v8a*.apk out/hiddify-android-arm64.apk || echo "no arm64 apk"
           mv out/*armeabi-v7a*.apk out/hiddify-android-arm7.apk || echo "no arm7 apk"
           mv out/*x86_64*.apk out/hiddify-android-x86_64.apk || echo "no x64 apk"
+          mv out/*.aab out/hiddify-android-playstore.aab || echo "no aab"
           mv out/*.AppImage out/hiddify-linux-x64.AppImage || echo "no app image"
+          mv out/*.dmg out/hiddify-macos-universal.dmg || echo "no macos dmg"
 
       - uses: actions/upload-artifact@v3
         with:
diff --git a/Makefile b/Makefile
index 2ed73c44..42128bf5 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,9 @@ translate:
 android-release:
 	flutter build apk --target-platform android-arm,android-arm64,android-x64 --split-per-abi
 
+android-aab-release:
+	flutter build aab --target-platform android-arm,android-arm64,android-x64 --split-per-abi  &&\	
+
 windows-release:
 	flutter_distributor package --platform windows --targets exe