From ca67e188c04217154214c506885fcccb122de0d2 Mon Sep 17 00:00:00 2001 From: lanrtop Date: Fri, 31 Jul 2026 07:25:48 +0900 Subject: [PATCH] =?UTF-8?q?fix(ci-status):=20get=5Fci=5Fstatus=20=E7=BB=93?= =?UTF-8?q?=E8=AE=BA=E5=8C=BA=E5=88=86=E4=B8=89=E6=80=81=E2=80=94=E2=80=94?= =?UTF-8?q?pending=20=E4=B8=8D=E5=86=8D=E8=AF=AF=E8=BE=93=E5=87=BA=20?= =?UTF-8?q?=E2=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add has_failure flag,使结论由两态(pass/fail)扩展为三态: ✅ 全部通过 / ⏳ 检查进行中 / ❌ 存在失败检查。 修复前 pending 和 failure 均输出 ❌,/ship 轮询无法区分排队与真实失败。 Feature-Confirmed: true --- src-tauri/src/commands/gitea.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src-tauri/src/commands/gitea.rs b/src-tauri/src/commands/gitea.rs index 2e8fb70..e935f99 100644 --- a/src-tauri/src/commands/gitea.rs +++ b/src-tauri/src/commands/gitea.rs @@ -781,6 +781,7 @@ pub fn gitea_api_get_ci_status(project_id: &str, commit_sha: &str) -> Result Result "✅", - "failure" | "error" => { all_pass = false; "❌" }, - _ => { all_pass = false; "⏳" }, + "success" => "✅", + "failure" | "error" => { all_pass = false; has_failure = true; "❌" }, + _ => { all_pass = false; "⏳" }, }; lines.push(format!("- {} `{}` — {} {}", icon, ctx, state, desc)); } let conclusion = if all_pass { "✅ 全部通过,可以合并" + } else if has_failure { + "❌ 存在失败检查,暂不建议合并" } else { - "❌ 存在失败或等待中的检查,暂不建议合并" + "⏳ 检查进行中,请稍后再查" }; lines.push(format!("\n**结论:{}**", conclusion));