Pull Request已成功合入, 合并人@cangjie-ci
(感谢 Anisimov Konstantin 的贡献)PR创建成功通知 | 感谢您的贡献 🎉
您好!系统已检测到您成功创建 Pull Request(PR),感谢您对项目的支持与参与!以下几点需要您着重关注:
一、PR必须关联Issue ❗️
触发门禁检查的必要步骤:在PR描述框输入Issue完整链接,完成Issue关联。
请注意,一个 Issue 不能同时关联同一 base 仓库内同一个分支的多个开启状态的 PR
二、门禁触发规则 🔧
- 门禁类型判定:由Issue关联的PR所属代码仓数量决定
- 关联多个代码仓PR:触发「多仓联合门禁」
- 关联单个代码仓PR:触发「单仓门禁」
- 启动指令与检查范围:需主动回复指令:
- 回复 "start build":执行Cangjie的主要基础检查,包含commit格式检查、静态告警分析、OAT开源声明检查、多平台构建、单元/集成测试等
- 关联同一issue的多个PR,仅需在任意一个PR里回复触发一次门禁,该PR门禁通过后,所有PR都会添加Label和测试人
- 每个pr只能同时运行一条CI流水线,如需重新启动,请先关闭运行中的,再评论触发门禁
- Markdown修改仅触发文档类构建测试门禁,不会触发Cangjie的编译测试门禁
- commit 信息格式请遵循:Conventional Commits 规范
- 请保证每一条 commit 都已添加
Signed-Off-By信息 - 回复 "start build cov":执行覆盖率构建工程,生成该提交的增量代码覆盖率报告
三、合入条件 ⚠️
- 满足最低评审人数,且评审问题需全部解决;
- 禁止合入本人创建的PR,需由其他协作者操作;
- 合并前确保关联流水线任务运行成功(build-test-passed);
- 需求类覆盖率门禁:当关联的 Issue 标题以
[feature]:开头(需求类 Issue)时,联合提交中属于cangjie_compiler、cangjie_runtime、cangjie_stdx、cangjie_tools、llvm-project仓库的 PR,必须先回复 "start build cov" 触发增量覆盖率流水线并通过,使 PR 获得cov-test-passed标签后方可合入。
四、合并PR ✅
回复 "start merge",CI流水线会自动检查所有关联PR的状态、版本号标签、检视意见密度、兼容性、需求类覆盖率门禁,若所有PR都满足合并条件,则将会同时合并所有PR。若存在不满足合并条件的PR,则不会合并任何PR。
如果希望不进行兼容性相关的检测,请任一合法审查人复制以下内容,在 start merge 前提交评论:
本 pr 不需要兼容性相关检测,对于引发的任何兼容性问题(即由于本 pr 合入将导致用户需适配代码的话),由本人承担。
If you wish to avoid compatibility-related checks, please have any approver copy the following content and submit it as a comment before sending start merge:
This PR does not require compatibility-related checks. For any compatibility issues caused by this PR (i.e., if the integration of this PR will require users to adapt their code), I will take full responsibility.
五、补充说明 📢
- 详细仓颉贡献流程:贡献流程(Cangjie Community Contribution)
- 门禁结果将自动评论至关联的所有PR,敬请留意。


⏳ 正在进行兼容性检测中,可能需要2~3分钟,请稍候,若10分钟无检测结果,请重新回复 start merge。
⏳ Compatibility check in progress. It may take 2–3 minutes. Please wait. If there is no result after 10 minutes, please reply with start merge again.


⏳ 正在进行兼容性检测中,可能需要2~3分钟,请稍候,若10分钟无检测结果,请重新回复 start merge。
⏳ Compatibility check in progress. It may take 2–3 minutes. Please wait. If there is no result after 10 minutes, please reply with start merge again.


✅ 合入前兼容性检测通过。
涉及仓库:Cangjie/cangjie_runtime, Cangjie/cangjie_test, Cangjie/cangjie_tools
结论
- 分析过程:已分析 Cangjie/cangjie_runtime#1730 与 Cangjie/cangjie_tools#1265。Cangjie/cangjie_runtime#1730 在 stdlib/libs/std/unittest/report_unittest_xml.cj 的 String.toSafeFileName() 中增加 org::name 到 name@org 的文件名转换;Cangjie/cangjie_tools#1265 在 cjpm/src/implement/test.cj 中恢复向 std.unittest 传递原始组织限定包名。组合 head 下两项改动形成单一转换链路,并检查了报告生成、bench 报告及序列化结构的调用关系。 Analyzed Cangjie/cangjie_runtime#1730 and Cangjie/cangjie_tools#1265. PR #1730 adds org::name to name@org conversion in String.toSafeFileName() in stdlib/libs/std/unittest/report_unittest_xml.cj; PR #1265 restores passing the raw organization-qualified package name to std.unittest in cjpm/src/implement/test.cj. The combined heads form one consistent conversion pipeline, and report generation, benchmark reports, and serialization-related call paths were checked.
- 原因:兼容。旧的无组织名包名行为保持不变;有组织名时,cjpm 传递原始包名,std.unittest 在统一的文件名入口转换为 Windows 安全的 name@org 形式,避免此前重复转换或包含冒号导致报告生成失败。改动未删除或改变公开 .cj API、ABI 符号、配置键、序列化字段或成功调用约定;变化仅修正组织限定报告文件名,属于兼容性修复。 Compatible. Package names without organizations retain their previous behavior. For organization-qualified names, cjpm now passes the raw package name and std.unittest performs the conversion to the Windows-safe name@org form at the common filename entry point, avoiding duplicate conversion or colon-containing report paths. No public .cj API, ABI symbol, configuration key, serialization field, or successful call contract is removed or changed; the change fixes organization-qualified report filenames and is compatible.
- 结论:兼容


✅ 以下PR将同时合入:
- Cangjie/cangjie_runtime#1730: fix(unittest): use name@org convention in report file names
- Cangjie/cangjie_test#2108: test: add HLT case for cjpm test reports with organization
- Cangjie/cangjie_tools#1265: fix: cjpm bench report file name problem on windows
✅ The following PRs will be merged simultaneously:
- Cangjie/cangjie_runtime#1730: fix(unittest): use name@org convention in report file names
- Cangjie/cangjie_test#2108: test: add HLT case for cjpm test reports with organization
- Cangjie/cangjie_tools#1265: fix: cjpm bench report file name problem on windows


Change Details (Required)
Adds HLT case HLT/Tools/cjpm/cjpm_build/organization/test_002 covering cjpm test behavior for a project with organization set: module-level summary output (single TP: huawei::test.* module) and xml-per-package report file names (test-test@huawei.xml, test-test.koo@huawei.xml, test-test.zoo@huawei.xml). Depends on the std.unittest fix from Cangjie/cangjie_runtime PR (same issue).
Change Type (Required)
Please describe the type of changes in this Pull Request (reason). Simply save and click the checkbox, or when editing, change
[ ]to[x]for the relevant item.Self-Check of Changes (Required)
Please do not modify or delete the following options. Simply save and click the checkbox, or when editing, change
[ ]to[x]for the relevant item.Local Test Case Verification Results:
Related Issues (Required)
https://gitcode.com/Cangjie/cangjie_runtime/issues/846