From ee8db8598371863e5f46eac1bb9776891f1a2a2d Mon Sep 17 00:00:00 2001 From: hiddify-com <114227601+hiddify-com@users.noreply.github.com> Date: Fri, 31 May 2024 21:28:45 +0200 Subject: [PATCH] tmp test --- .github/workflows/build.yml | 43 +++++++++++++++++++------------------ Makefile | 2 +- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09e8ec4a..0d63c896 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ env: IS_GITHUB_ACTIONS: 1 CHANNEL: "${{ inputs.channel }}" FLUTTER_VERSION: '3.22.1' - NDK_VERSION: r26b + NDK_VERSION: r26d UPLOAD_ARTIFACT: "${{ inputs.upload-artifact }}" TAG_NAME: "${{ inputs.tag-name }}" TARGET_NAME_AppImage: "Hiddify-Linux-x64" @@ -36,11 +36,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: subosito/flutter-action@v2.12.0 #issue with 2.13 + - uses: subosito/flutter-action@v2.16.0 #issue with 2.13 with: flutter-version: ${{ env.FLUTTER_VERSION }} channel: 'stable' cache: true + - name: Prepare run: make linux-prepare - name: Test @@ -66,26 +67,26 @@ jobs: os: ubuntu-latest targets: aab - - platform: windows - os: windows-2019 - aarch: amd64 - targets: exe,msix + # - platform: windows + # os: windows-2019 + # aarch: amd64 + # targets: exe,msix - - platform: linux - os: ubuntu-22.04 - aarch: amd64 - targets: AppImage,deb,rpm + # - platform: linux + # os: ubuntu-22.04 + # aarch: amd64 + # targets: AppImage,deb,rpm - - platform: macos - os: macos-13 - aarch: universal - targets: dmg,pkg + # - platform: macos + # os: macos-13 + # aarch: universal + # targets: dmg,pkg - - platform: ios - os: macos-13 - aarch: universal - filename: hiddify-ios - targets: ipa + # - platform: ios + # os: macos-13 + # aarch: universal + # filename: hiddify-ios + # targets: ipa runs-on: ${{ matrix.os }} steps: - name: checkout @@ -116,13 +117,13 @@ jobs: cache: true - name: Setup Java if: startsWith(matrix.platform,'android') - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 - name: Setup NDK if: startsWith(matrix.platform,'android') - uses: nttld/setup-ndk@v1.4.1 + uses: nttld/setup-ndk@v1 id: setup-ndk with: ndk-version: ${{ env.NDK_VERSION }} diff --git a/Makefile b/Makefile index 695b5221..cea1f572 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,7 @@ gen_translations: #generating missing translations using google translate android-release: android-apk-release android-apk-release: - flutter build apk --verbose --target-platform android-arm,android-arm64,android-x64 --split-per-abi --target $(TARGET) $(BUILD_ARGS) + flutter build apk --target $(TARGET) $(BUILD_ARGS) --target-platform android-arm,android-arm64,android-x64 --split-per-abi --verbose ls -R build/app/outputs android-aab-release: