From 9873f670fa69b1cf2695c204e395cc7a2146c5e2 Mon Sep 17 00:00:00 2001
From: shanshanzhong <shanshanzhong147@gmail.com>
Date: Fri, 7 Nov 2025 03:44:11 -0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E5=B0=86jq=E5=AE=89=E8=A3=85=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=E7=A7=BB=E8=87=B3copy=5Flibcore.bat=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将jq的安装从docker.yml工作流文件移至copy_libcore.bat脚本中，以简化CI配置并集中管理依赖安装
---
 .gitea/workflows/docker.yml | 12 ------------
 copy_libcore.bat            | 22 +++++++++++++++++++++-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml
index 4111e5b..3f07ef3 100644
--- a/.gitea/workflows/docker.yml
+++ b/.gitea/workflows/docker.yml
@@ -131,18 +131,6 @@ jobs:
       shell: cmd
       run: call copy_libcore.bat
 
-    - name: Install jq
-      shell: powershell
-      run: |
-        if (!(Get-Command choco -ErrorAction SilentlyContinue)) {
-          Set-ExecutionPolicy Bypass -Scope Process -Force
-          [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
-          iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
-        }
-        choco install jq -y
-        $env:Path = [System.Environment]::GetEnvironmentVariable('Path','Machine') + ';' + [System.Environment]::GetEnvironmentVariable('Path','User')
-        jq --version
-
     - name: Setup Flutter
       uses: subosito/flutter-action@v2
       with:
diff --git a/copy_libcore.bat b/copy_libcore.bat
index e06d88e..b1ff5d4 100644
--- a/copy_libcore.bat
+++ b/copy_libcore.bat
@@ -22,10 +22,30 @@ for /r %%f in (libcore.dll) do (
     if exist "%%f" (
         echo ✅ 找到 libcore.dll: %%f
         copy "%%f" libcore\bin\libcore.dll
-        goto :verify
+        goto :install_jq
     )
 )
 echo ⚠️ 未找到 libcore.dll
+
+:install_jq
+echo 📦 安装 jq...
+powershell -Command "
+  if (!(Get-Command choco -ErrorAction SilentlyContinue)) {
+    Set-ExecutionPolicy Bypass -Scope Process -Force;
+    [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;
+    iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+  }
+  choco install jq -y
+  $env:Path = [System.Environment]::GetEnvironmentVariable('Path','Machine') + ';' + [System.Environment]::GetEnvironmentVariable('Path','User')
+  jq --version
+"
+if %ERRORLEVEL% neq 0 (
+    echo ❌ jq 安装失败
+    exit /b 1
+)
+echo ✅ jq 安装成功
+
+goto :verify
 :verify
 
 echo.