Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Read [PR checks and merge process](https://github.com/VisActor/VRender/blob/deve
- [ ] Ran relevant unit tests and full official-baseline comparison for product/dependency/case changes, or explained documentation-only applicability. Self-comparison is not a two-sided pass.
- [ ] Described expected visual changes and regression coverage; retained execution errors and blockers.

Photo needs maintainer review. Report-only/completed is not an all-Photo pass; approval is tied to the current commit and never automatically merges or updates baselines.
Photo needs maintainer review; report-only/completed is not an all-Photo pass. Approve is an audit record and the Bot never merges. When Photo selection is explicitly enabled, only the saved pre-merge selection can update baselines after manual merge; other PRs retain their existing mode.


⚠️ Please check all items below before requesting a reviewing. ⚠️
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE/pr_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
- [ ] 产品/依赖/用例变更已完成相关单测及默认全量基线比较;纯文档说明不适用。自比较不能代替双侧通过。
- [ ] 已说明预期视觉变化及新增/修改的回归用例;执行错误和阻断如实保留。

Photo由维护者人工核查,report-only/流程完成不等于Photo全通过;批准绑定当前提交,不自动Merge或更新基准。
Photo 由维护者人工核查,report-only/流程完成不等于 Photo 全通过;Approve 仅作审计,Bot 不自动 Merge。仅明确启用图文选择的 PR 可在人工合入后按合入前保存的修订更新所选基准,其他 PR 保持原模式。


⚠️ 在提交 PR 之前,请检查一下内容. ⚠️
Expand Down
14 changes: 9 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,21 @@ Passing all three checks or reaching completed does not mean every Photo test pa
| Changes or investigation needed | Fix the issue, add coverage or provide verifiable evidence |
| Blocked | Read the action item; ask maintainers about permissions, services or recovery |
| Awaiting approval | Maintainer checks all three results and manually reviews Photo for the current revision |
| Awaiting merge | A valid current-commit approval was recognized; a maintainer merges manually |
| Merged / baseline processing | Wait for cleanup; skipping automatic baseline updates is expected in report-only mode |
| Awaiting merge | The three recommendations are complete; inspect Photo and any saved selection, then merge manually subject to repository rules |
| Merged / baseline processing | Check selected-baseline results when selection is enabled; otherwise automatic updates remain skipped |
| Completed | Workflow cleanup finished; original Photo differences and errors remain |
| Superseded / closed without merge | Read the new revision's result, or treat the PR as unmerged; neither implies a baseline update |

A new head or comparison base requires version checks and necessary reruns. Old results cannot prove the new revision passed; a new commit needs its own valid approval. If a summary is missing, check repository, target, creation time, draft status before contacting maintainers.
A new head or comparison base requires version checks and necessary reruns. Old results cannot prove the new revision passed; verify current results and any saved Photo selection again for each new commit. If a summary is missing, check repository, target, creation time, draft status before contacting maintainers.

### Approval, merge and recovery

The workflow recognizes a valid GitHub Approve from a repository Maintain/Admin user for the **current commit**, including their manual Photo verification. The Bot never approves or merges. GitHub protection rules and other checks still apply; the workflow does not add required Checks or change branch protection.
GitHub Approve is an audit record in this workflow. Maintainers may merge manually after checking CR, unit tests, Playwright and Photo for the current commit. GitHub branch protection and repository review requirements still apply. The Bot does not change those rules, approve, or merge.

Automatic Photo difference assessment and baseline updates are paused. Approve/Merge does not authorize automatic adoption of screenshots. Early merge does not turn incomplete or failed checks into passes. Shared baseline changes require separate explicit authorization, administrator review and a new verification; retain original reports.
For PRs explicitly enabled for Photo selection, BugServer shows the current images and short explanations. New candidates are selected by default. Inspect each item, deselect any baseline that should stay unchanged, and save successfully before merging. The server's saved revision is authoritative; an unsaved draft has no effect. Default selection does not overwrite a saved manual choice.

After merge, only the selected baselines in that revision are updated. Unselected items stay unchanged. Writes still verify the frozen commit, three checks, merged content, save time and original baseline. Stale versions, post-merge selections and conflicts are not silently accepted. Ask maintainers to resume the original task after a timeout or partial success; do not dispatch another batch or change request IDs.

Photo remains report-only. An unavailable selection list, including more than 20 differences, incomplete explanations or execution errors, adds no merge gate and does not update baselines. PRs without this capability retain their existing mode. Baseline updates do not rewrite the original Photo report, and completed does not mean Photo passed.

For help, provide the PR, current SHA, Review/CI links and a public-safe error description. Do not edit managed summaries or hidden markers, repeatedly reopen PRs, delete state, change request IDs or dispatch duplicate batches. Maintainers recover the original task. Stop test servers, browsers and child processes you started when finished.
14 changes: 9 additions & 5 deletions CONTRIBUTING.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,21 @@ node common/scripts/install-run-rush.js eslint --only tag:package
| 存在待修复或待调查项 | 阅读问题,修复代码、补用例或提供可验证证据 |
| 流程受阻 | 查看具体待办;权限、服务或任务恢复问题交由维护者处理 |
| 等待人工批准 | 维护者核对当前版本的三项结果,并人工核查 Photo |
| 等待人工合入 | 当前提交的有效批准已识别,由维护者人工 Merge |
| 已合入/核对基准阶段 | 等待收尾;report-only 下跳过自动基准更新是预期行为 |
| 等待人工合入 | 三项建议已完成,维护者核查 Photo 与可用保存修订后按仓库规则手动 Merge |
| 已合入/核对基准阶段 | 已启用图文选择时核对所选基准处理结果;未启用时仍跳过自动更新 |
| 流程已完成 | 表示流程收尾,不改写原 Photo 差异或错误 |
| 被新版本替代/未合入关闭 | 前者查看新版本结果,后者不表示已合入或基准已更新 |

推送新提交或 base 变化后重新核对版本并执行必要检查;旧结果不能证明新版本通过,新提交需要对应的有效批准。缺少摘要时先检查同仓、目标、创建时间、Draft范围,再联系维护者。
推送新提交或 base 变化后重新核对版本并执行必要检查;旧结果不能证明新版本通过,新提交须重新核对结果及可用的 Photo 保存修订。缺少摘要时先检查同仓、目标、创建时间、Draft范围,再联系维护者。

### 批准、合入和异常恢复

工作流识别具有仓库 Maintain/Admin 权限的维护者对**当前提交**作出的有效 GitHub Approve,该批准同时表示已人工核查 Photo。Bot 不自动 Approve/Merge;GitHub 分支保护和其他检查仍适用,工作流不新增强制 Checks 或修改仓库规则。
工作流中的 GitHub Approve 仅作审计;维护者核对当前提交的 CR、单测、Playwright 和 Photo 后,可以直接手动 Merge。GitHub 分支保护或仓库评审要求仍然适用,Bot 不会修改这些规则,也不会代为 Approve 或 Merge。

@visactor-review-bot visactor-review-bot Bot Nov 11, 2026 •

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[P2] 同步更新仍将有效 Approve 写为必需的合入指引

当仓库规则本身不要求 Approve 且维护者已核查当前提交时,这里允许直接 Merge;但同文件第 108、113 行仍把有效批准写成进入“等待人工合入”及新提交的必要条件,英文版也保留相同说法。两种指引对同一场景相互冲突,维护者可能继续等待一个按新流程并非必要的批准。请将状态表和版本说明改为与可选 Approve 一致,并明确仓库规则要求批准时的例外。


已确认修复 (def407a): 原触发条件是仓库不强制 Approve 且维护者已核查当前提交。当前中文状态表已把等待合入定义为三项建议完成后按仓库规则手动 Merge,版本说明改为重新核对当前结果和保存修订;批准段明确 Approve 仅作审计且仓库规则仍适用。英文对应状态表与版本说明已同步,原先将有效 Approve 作为工作流必要条件的矛盾消失。


Photo 自动差异评估及标准图自动更新暂停。Approve/Merge 不授权自动采用测试图;提前合入不会使未完成或失败的检查变为通过。新增/修改共享基准需管理员另行获得明确授权、人工核查并安排复验,原报告保留。
对已明确启用图文选择的 PR,BugServer 展示当前版本的图片和短说明,新候选默认全选。维护者应逐项核查;需要保留旧基准的项目取消选择,并在合入前保存成功。以服务端显示的保存修订为准,未保存草稿不生效;已保存的人工选择不会被默认全选覆盖。

合入后只更新该修订已选的基准,未选项不变。写入前仍核对冻结提交、三项检查、实际合入内容、保存时间及原基准;旧版本、合入后补选或冲突不能自动补认。请求超时或部分成功时联系维护者按原任务恢复,不重新派发或更换请求 ID。

@visactor-review-bot visactor-review-bot Bot Nov 11, 2026 •

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[P2] 区分启用图文选择后的基准更新与原有跳过状态

已启用选择且合入前成功保存选中项时,本段要求合入后更新这些基准;但同文件第 109 行的“已合入/核对基准阶段”仍说 report-only 下跳过自动基准更新是预期行为,英文版也一样。Photo 在新流程中仍为 report-only,因此维护者遇到选中项未更新时可能照状态表认定无需处理,错过本段要求的恢复。请把该行明确限定为未启用选择或清单不可用的 PR,并说明已保存选中项却未更新时需要核查或恢复。


已确认修复 (def407a): 原触发条件是启用选择、合入前已保存选中项,合入后更新却被跳过。当前中英文状态表均明确启用选择时须核对所选基准处理结果,跳过自动更新只适用于未启用选择;正文要求只更新已选项,无可用清单的人工处理边界也已明确,原来将遗漏误判为 report-only 正常跳过的矛盾消失。


Photo 始终 report-only。没有可用选择清单(例如差异超过20项、解释未完成或执行错误)不新增合入门禁,也不自动更新基准。未启用图文选择的 PR 保持原模式。基准更新不会改写原 Photo 报告,流程 completed 不等于 Photo 全部通过。

请求帮助时提供 PR、当前 SHA、Review/CI 链接和可公开的错误说明。不要编辑 Bot 受管摘要或隐藏标记,不通过反复开关 PR、删除状态、换请求 ID 或另派批次绕过去重;由维护者回读和恢复原任务。结束时停止本次启动的测试服务、浏览器和子进程。
6 changes: 5 additions & 1 deletion packages/vrender/__tests__/visual/BUGSERVER_CASE_WORKFLOW.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ Photo保持report-only:差异、缺基准、错误、未完成状态如实保

## 5. 首次基准与后续更新

新case缺基准时先核对本轮执行成功、目标状态和测试图正确;缺图、执行错误和未完成结果不能采用。Approve/Merge不授权自动采用图片,工作流不自动建立或更新基准。
新case缺基准时先核对本轮执行成功、目标状态和测试图正确;缺图、执行错误和未完成结果不能采用。

对明确启用图文选择的 PR,先在 BugServer 核对当前冻结版本的图片、短说明及服务端保存修订;新候选默认全选,改选必须在合入前保存成功。维护者按仓库规则手动 Merge 后,工作流核验版本、三项建议、合入内容和原基准,只处理已选项,未选项不变。Approve 仅作审计,不代替图片核查;更新失败、部分成功或结果未知时联系维护者按原任务恢复,不另行手工重复写入。

未启用图文选择或没有可用清单时,Approve/Merge 本身不授权自动采用图片,仍按以下人工流程处理。

具有基准写权限的管理员另行取得本次更新授权,核对准确产品、case/interaction、报告及task,读取现有标准引用后按平台支持的条件更新执行;只在明确无基准时使用“无基准”条件,不能把未知当空或无条件覆盖。结果未知保留原请求标识与输入,回读恢复,不换ID。

Expand Down
Loading