Repository navigation
revert: 撤销 PR #170–#176，恢复合入前代码 - #177
Merged
2 commits merged intoNov 10, 2026
Merged
2 commits merged into
2 commits merged into
Conversation
Reverse the seven merge results in reverse first-parent order. The resulting tree exactly matches dev before PR #170, including original whitespace. Keep all original feature branches and the remote pre-rollback backup. No feature or rollback PR may be merged without explicit maintainer permission.
This was referenced Nov 9, 2026
Run candidate checks for stacked targets and honor ci:full-android to require assembleDebug and testDebugUnitTest. Clean the restored historical FFmpeg trailing space. Keep all PRs open pending explicit maintainer permission.
3316891527
added
the
ci:full-android
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
变更说明 / Description
按维护者要求撤销 #170–#176 的七项合并结果，并修复恢复过程中的 CI 验证缺失。此 PR 保持 open，任何合并或自动合并都必须等待维护者明确许可。
背景与动机 / Context and motivation
原回滚恢复了 FFmpegUtil.kt 的历史尾随空白，导致 hygiene 失败；七项替代 PR 的目标为回滚分支，被原 dev 目标过滤排除。维护者明确要求实际运行 assembleDebug 和测试。
改动范围 / Changes
七项业务和原 CI 修复仍全部撤销；在恢复基准上增加一处尾随空白清理，以及 PR Check 对叠加目标和 ci:full-android 标签的支持。启用该标签后必须实际运行 assembleDebug 与 :app:testDebugUnitTest，聚合状态要求两项成功。固定候选身份校验仍保持原回滚版本；原 #174 的候选基准修复仍在独立 PR #182 审阅。
原 #170–#176 已合并，GitHub 不允许重开；对应的七项独立 open PR 是 #178、#179、#180、#181、#182、#183、#184。它们以本回滚分支为目标，保留各项独立差异。本撤销获准进入 dev 后才改目标；七项功能合并仍需另获许可。
兼容性与风险 / Compatibility and risks
七项业务功能及修复恢复到合入前状态，已修复的问题可能再次出现。本轮允许清理格式与完善 CI，因此不再宣称与历史基准整树逐字节相同。新增 CI 不发布安装包、不修改保护规则、不合并代码。原功能分支和撤销前备份完整保留，dev 尚未撤销。
关联 Issue / Related issue
维护者要求撤销原 #170–#176，并修复回滚与七项替代 PR 的完整 Android 验证。
验证方式 / Verification
本地 Git diff --check、73 项现有和新增门禁回归及仓库 hygiene 检查通过；Markdown 链接与本地化检查由本轮 PR CI 执行。八项 PR 均启用 ci:full-android，当前 GitHub 候选的 assembleDebug 与 testDebugUnitTest 结果将分别记录，未完成前不宣称通过。
证据 / Evidence
撤销前 dev：c944cdd8bd1b81dd92a53b00f3680f966fe10bc8；历史恢复基准：50069cbac65f4e4360c6b271854abe527124b84f；当前修复提交：70a5323ecfbcbb3eaa3f780ec89625f7d8d27579。完整门禁说明见 ci/README.md 和 docs/TODO/ci/full-android-pr-validation/index.md。
检查清单 / Checklist