From 067147a84aed7ffde1d2544698bd3560ff06c999 Mon Sep 17 00:00:00 2001 From: Kingtous Date: Thu, 25 May 2023 17:49:17 +0800 Subject: [PATCH 1/3] opt: try ndk to 25c --- .github/workflows/flutter-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 0f43e979c..28490a28a 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -19,7 +19,7 @@ env: # for multiarch gcc compatibility VCPKG_COMMIT_ID: "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1" VERSION: "1.2.0" - NDK_VERSION: "r23" + NDK_VERSION: "r25c" #signing keys env variable checks ANDROID_SIGNING_KEY: '${{ secrets.ANDROID_SIGNING_KEY }}' MACOS_P12_BASE64: '${{ secrets.MACOS_P12_BASE64 }}' From b6bb8c64b4177d6ed12cfd9978493f3f06d20b94 Mon Sep 17 00:00:00 2001 From: Kingtous Date: Thu, 25 May 2023 19:07:57 +0800 Subject: [PATCH 2/3] try change ndk to 3.1.2 --- .github/workflows/flutter-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 28490a28a..61b83dc0e 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -535,7 +535,7 @@ jobs: VCPKG_ROOT: /opt/rustdesk_thirdparty_lib/vcpkg run: | rustup target add ${{ matrix.job.target }} - cargo install cargo-ndk + cargo install cargo-ndk --version 3.1.2 case ${{ matrix.job.target }} in aarch64-linux-android) ./flutter/ndk_arm64.sh From 6af72edd034999c81e34fc4758b96537ec8941c1 Mon Sep 17 00:00:00 2001 From: Kingtous Date: Thu, 25 May 2023 22:49:55 +0800 Subject: [PATCH 3/3] fix: add cargo ndk version specification --- .github/workflows/flutter-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 61b83dc0e..3f81d45c0 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -8,6 +8,7 @@ on: default: true env: + CARGO_NDK_VERSION: "3.1.2" LLVM_VERSION: "15.0.6" FLUTTER_VERSION: "3.10.1" FLUTTER_RUST_BRIDGE_VERSION: "1.75.3" @@ -535,7 +536,7 @@ jobs: VCPKG_ROOT: /opt/rustdesk_thirdparty_lib/vcpkg run: | rustup target add ${{ matrix.job.target }} - cargo install cargo-ndk --version 3.1.2 + cargo install cargo-ndk --version ${{ env.CARGO_NDK_VERSION }} case ${{ matrix.job.target }} in aarch64-linux-android) ./flutter/ndk_arm64.sh