From c32a1fd757e1d82787cc3790aa3d81a34bbe2620 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 8 Sep 2024 11:49:52 +0800
Subject: [PATCH] =?UTF-8?q?mod:=20=E5=B0=9D=E8=AF=95=E6=B7=BB=E5=8A=A0cher?=
 =?UTF-8?q?ry-pick=20d4124bd=E4=BB=A5=E4=BF=AE=E5=A4=8D=E5=AD=97=E9=87=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CI.yml | 12 +++++++++++-
 pubspec.lock             |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 002a44274..56e709691 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -104,7 +104,17 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
             flutter-version: 3.24.2
-            channel: any
+            channel: stable
+
+      - name: 修复3.24的stable显示中文不正确问题
+        run: |
+          cd $FLUTTER_ROOT
+          git config --global user.name "orz12"
+          git config --global user.email "orz12@test.com"
+          git cherry-pick d4124bd --strategy-option theirs
+          # flutter precache
+          flutter --version
+          cd -
 
       - name: 下载项目依赖
         run: flutter pub get
diff --git a/pubspec.lock b/pubspec.lock
index e3178ba33..512514b31 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1868,4 +1868,4 @@ packages:
     version: "3.1.2"
 sdks:
   dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.24.2"
+  flutter: ">=3.24.0"