From 551da29b3bfe9c3eefa9a16a51d4136206797bc4 Mon Sep 17 00:00:00 2001 From: hermes Date: Mon, 12 Oct 2026 19:43:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(ci-gate):=20=E4=BA=8B=E4=BB=B6=E8=B4=9F?= =?UTF-8?q?=E8=BD=BD=E6=B2=A1=E6=9C=89=20total=5Fcommits=20=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=8A=9B=E6=9C=AA=E6=94=B6=E6=95=9B=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=EF=BC=9B=E4=B8=8A=E6=8A=A5=E8=A1=A5=E9=BD=90=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=89=80=E9=9C=80=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit resolve_scope():declared 未初始化就参与判断 —— 负载缺 total_commits 时抛 UnboundLocalError(Gitea 推送负载一直带该字段,所以线上未暴露;换触发形状就是未收敛异常)。改为 declared=None 初始化。 ci_report.py:按通知消息规范补 job(从 workflow 文件读真实 job 名)/ run_number / run_attempt / commits(复用门禁同一个范围解析器,含 range_source)/ compare_url(只在有真实 before..after 时给)/ first_failure / next_step / limitations;commit_count 以准确范围为准。不改检查流程、不改 workflow。 --- .gitea/scripts/ci_gate.py | 3 +- .gitea/scripts/ci_report.py | 120 +++++++++++++++++++++++++++++++++++- 2 files changed, 120 insertions(+), 3 deletions(-) diff --git a/.gitea/scripts/ci_gate.py b/.gitea/scripts/ci_gate.py index e2b4d1f..b62b10e 100755 --- a/.gitea/scripts/ci_gate.py +++ b/.gitea/scripts/ci_gate.py @@ -184,6 +184,7 @@ def resolve_scope(explicit="", env=None, cwd=None): if not commits: return [], src, ("本次推送的 Git 范围是空的(before == after?)—— 空范围没有可核的提交," "不许静默通过") + declared = None # 负载没声明条数时保持 None(否则下面会 NameError) if declared_raw not in (None, ""): try: declared = int(declared_raw) @@ -478,4 +479,4 @@ def self_test() -> int: if __name__ == "__main__": - sys.exit(main(sys.argv[1:])) \ No newline at end of file + sys.exit(main(sys.argv[1:])) diff --git a/.gitea/scripts/ci_report.py b/.gitea/scripts/ci_report.py index 8d49ef7..16381b9 100644 --- a/.gitea/scripts/ci_report.py +++ b/.gitea/scripts/ci_report.py @@ -192,6 +192,100 @@ def self_test() -> int: return 0 +# ── 通知消息规范(ci-notification-message-standard §5)需要的字段 ────────────── +# 全部**由程序从真实事实算**:job 名来自 workflow 文件、范围来自门禁的同一个解析器、 +# 统计来自权威清单。缺就缺(消息里显示"未取得"),绝不用写死的值凑格式。 +def _job_name() -> str: + """真实 job 名:从 workflow 文件里读 `jobs:` 下的第一个 job(不写死 build)。""" + for p in (ROOT / ".gitea" / "workflows").glob("*.y*ml"): + try: + txt = p.read_text(encoding="utf-8") + except Exception: + continue + m = re.search(r"^jobs:\s*$\n(.*)", txt, re.M | re.S) + if m: + m2 = re.search(r"^ ([A-Za-z0-9_.-]+):", m.group(1), re.M) + if m2: + return m2.group(1) + return os.environ.get("GITHUB_JOB", "") + + +def _scope_for_notify(): + """本次**准确范围**:复用门禁的同一个解析器(不另写一套范围逻辑)。 + + 返回 (commits:[{sha,subject}], source:str, err:str)。取不到就给空 —— 不猜。 + """ + try: + sys.path.insert(0, str(ROOT / ".gitea" / "scripts")) + import ci_gate # type: ignore + commits, source, err = ci_gate.resolve_scope() + out = [] + for c in (commits or [])[:10]: + msg = str(c.get("message") or "").strip().splitlines() + out.append({"sha": str(c.get("sha") or ""), "subject": (msg[0] if msg else "")}) + return out, source, err or "" + except Exception as e: + return [], "", f"{e.__class__.__name__}" + + +def _compare_url(repo: str) -> str: + """变更列表链接:只有拿到真实的 before/after 才给(不然就是编一个打不开的地址)。""" + base = (os.environ.get("GITHUB_SERVER_URL") or "").rstrip("/") + ev = (os.environ.get("GITHUB_EVENT_PATH") or "").strip() + if not base or not repo or not ev or not os.path.exists(ev): + return "" + try: + with open(ev, encoding="utf-8") as fh: + d = json.load(fh) + before, after = str(d.get("before") or ""), str(d.get("after") or "") + if (len(before) == 40 and len(after) == 40 and set(before) != {"0"} + and set(after) != {"0"} and before != after): + return f"{base}/{repo}/compare/{before}...{after}" + except Exception: + pass + return "" + + +def _first_failure(checks: list) -> dict: + """首个失败项(优先真失败,其次"未运行/缺项"—— 两者都不等于通过)。""" + for c in checks or []: + if str(c.get("status")) == "failure": + return {"id": c.get("id"), "reason": str(c.get("reason") or "").strip()[:400]} + for c in checks or []: + if str(c.get("status")) in ("not_run", "unknown", "skipped"): + return {"id": c.get("id"), + "reason": f"未运行/跳过({c.get('status')})—— 不算通过"} + return {} + + +def _next_step(checks: list) -> str: + """可复现入口:指向项目唯一门禁入口与该检查项(真实命令,不是建议口号)。""" + ff = _first_failure(checks) + if ff.get("id"): + return f"本地复现:make verify(或 python3 scripts/ci_checks.py --only {ff['id']})" + return "本地复现:make verify(唯一门禁入口)后查看报告" + + +def _limitations(checks: list, rep: dict) -> list: + """范围限制:**只写事实**(跳过了哪些检查、格式债基线还剩多少),不写"全部通过"。""" + out = [] + skipped = [str(c.get("id")) for c in (checks or []) if str(c.get("status")) == "skipped"] + if skipped: + out.append("已跳过的检查(不算通过):" + "、".join(skipped[:6])) + try: + base = json.loads((ROOT / "web" / ".prettier-baseline.json").read_text(encoding="utf-8")) + n = len(base.get("files") or base if isinstance(base, (list, dict)) else []) + if isinstance(base, dict): + n = len(base.get("files") or base.get("entries") or {}) + if n: + out.append(f"前端格式债基线:{n} 个文件(只减不增,到期前必须清零)") + except Exception: + pass + for x in (rep.get("limitations") or [])[:3]: + out.append(str(x)[:160]) + return out[:4] + + def main(argv: list[str]) -> int: ap = argparse.ArgumentParser() ap.add_argument("--report", default=os.environ.get("CI_REPORT", str(ROOT / "ci-report.json"))) @@ -257,6 +351,14 @@ def main(argv: list[str]) -> int: if problems: print("❌ 汇总不可信/不完整 ⇒ 不能报绿(作业这次不算通过)", file=sys.stderr) + _scope_commits, _scope_source, _scope_err = _scope_for_notify() + _scope_payload = {"commits": _scope_commits, "source": _scope_source, + "count": len(_scope_commits)} + if _scope_err: + print(f"⚠️ 通知里不含本次范围摘要(范围解析:{_scope_err[:120]})", file=sys.stderr) + payload_count = rd(os.environ.get("CI_COMMITS_COUNT_FILE", ""), "") or git( + "rev-list", "--count", "HEAD~1..HEAD") + payload = { # —— bridge 既有字段(保持兼容,不改 bridge)—— "repo": rep.get("repository") or os.environ.get("GITHUB_REPOSITORY", "unknown/unknown"), @@ -266,8 +368,7 @@ def main(argv: list[str]) -> int: "workflow": os.environ.get("GITHUB_WORKFLOW", "build"), "status": BRIDGE_STATUS.get(overall, "failure"), "commit_subject": git("log", "-1", "--format=%s"), - "commit_count": rd(os.environ.get("CI_COMMITS_COUNT_FILE", ""), "") or git("rev-list", - "--count", "HEAD~1..HEAD"), + "commit_count": payload_count, "duration_s": rep.get("duration_s", "?"), "preview_url": rd(str(ROOT / ".ci-preview-url")), "log": rd(os.environ.get("CI_GATE_LOG", ""))[-3500:], @@ -293,6 +394,21 @@ def main(argv: list[str]) -> int: "expected_sha": expect_sha, "reported_sha": rep.get("commit_sha")}, "notification_status": "not_attempted", "deployed": False, # 本 workflow 只做 CI:没有部署,报告里也这么写 + + # —— 通知消息规范需要的字段(缺就缺,不许编)—— + "schema_version": 2, + "job": _job_name(), # 真实 job 名(来自 workflow 文件) + "run_number": os.environ.get("GITHUB_RUN_NUMBER", ""), + "run_attempt": os.environ.get("GITHUB_RUN_ATTEMPT", "1"), + "commits": _scope_payload["commits"], # 准确范围里的提交标题(≤10 条) + "range_source": _scope_payload["source"], # 范围是怎么算出来的(可复盘) + "commit_count": (_scope_payload["count"] or payload_count), # 条数由 Git 算 + "compare_url": _compare_url(rep.get("repository", "")), + "run_duration_s": "", # 整次运行耗时:本 workflow 没留起点 ⇒ 不编 + "duration_kind": "gate", + "first_failure": _first_failure(checks), + "next_step": _next_step(checks), + "limitations": _limitations(checks, rep), } base = (os.environ.get("CI_BRIDGE_RESOLVED") or os.environ.get("BRIDGE_URL") or "").rstrip("/")