From 746c1de118286a2b56170e8abcf15a5a3fb55e68 Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Sat, 11 Mar 2023 10:59:33 +0800
Subject: [PATCH 1/2] fix: try upgrade ndk version to r23

---
 .github/workflows/flutter-ci.yml      | 3 ++-
 .github/workflows/flutter-nightly.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml
index 5eda9ad18..74f233276 100644
--- a/.github/workflows/flutter-ci.yml
+++ b/.github/workflows/flutter-ci.yml
@@ -23,6 +23,7 @@ env:
   # for multiarch gcc compatibility
   VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44"
   VERSION: "1.2.0"
+  NDK_VERSION: "r23"
 
 jobs:
   build-for-windows:
@@ -354,7 +355,7 @@ jobs:
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r22b
+          ndk-version: ${{ env.NDK_VERSION }}
           add-to-path: true
 
       - name: Download deps
diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml
index 2a1254e23..da83637e8 100644
--- a/.github/workflows/flutter-nightly.yml
+++ b/.github/workflows/flutter-nightly.yml
@@ -14,6 +14,7 @@ env:
   # for multiarch gcc compatibility
   VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44"
   VERSION: "1.2.0"
+  NDK_VERSION: "r23"
   #signing keys env variable checks
   ANDROID_SIGNING_KEY: '${{ secrets.ANDROID_SIGNING_KEY }}'
   MACOS_P12_BASE64: '${{ secrets.MACOS_P12_BASE64 }}'
@@ -454,7 +455,7 @@ jobs:
       - uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r22b
+          ndk-version: ${{ env.NDK_VERSION }}
           add-to-path: true
 
       - name: Download deps

From 975918f85d4a5f5eeb44cacc749b6e19fe9d6716 Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Sat, 11 Mar 2023 12:05:42 +0800
Subject: [PATCH 2/2] fix: install ndk by force

---
 .github/workflows/flutter-nightly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml
index da83637e8..6ec398c73 100644
--- a/.github/workflows/flutter-nightly.yml
+++ b/.github/workflows/flutter-nightly.yml
@@ -431,7 +431,7 @@ jobs:
           - {
               arch: x86_64,
               target: aarch64-linux-android,
-              os: ubuntu-18.04,
+              os: ubuntu-20.04,
               extra-build-features: "",
             }
           # - {