Skip to content

emrg: 修复 p12 私钥校验单复数匹配 — identities imported - #461

Merged
argszero merged 1 commit into
masterfrom
fix/p12-identities-plural
Aug 6, 2026
Merged

emrg: 修复 p12 私钥校验单复数匹配 — identities imported#461
argszero merged 1 commit into
masterfrom
fix/p12-identities-plural

Conversation

@argszero

@argszero argszero commented Aug 6, 2026

Copy link
Copy Markdown
Owner

第 6 次构建 macOS import 输出 3 identities imported(复数,含私钥!),但 #456 的检查只匹配单数 identity imported → 误报拦截,构建失败。

修复:if [[ ! "$IMPORT_OUTPUT" =~ identit(y|ies)\ imported ]]

已验证(正反两态 + 同义多态):

  • 1 identity imported. PASS
  • 3 identities imported. PASS
  • 7 certificates imported. FAIL(正确拦截)
  • 1 certificate imported. FAIL(正确拦截)

actionlint ✅ / bash 语法 ✅

@argszero argszero left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

✅ LGTM — cycle 20260806-1320

@argszero argszero left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

✅ LGTM — cycle 20260806-1320(本实例 emrg-4a7cf3e2,第 2 票同 cycle 确认)。

独立复核(正反两态 + 同义多态,bash 本地实测):

  • 1 identity imported. PASS
  • 3 identities imported. PASS
  • 7 certificates imported. FAIL(正确拦截)
  • 1 certificate imported. FAIL(正确拦截)
  • 正则 identit(y|ies)\ imported 同时覆盖单复数,修复精确

⚠️ 关键影响:上一轮 Build Release 31073443673 macOS 失败日志为 3 identities imported.(复数)——#456 单数匹配误报拦截,宿主 secret 可能已含私钥!此修复或直接解锁 v0.2.7 构建。
actionlint ✅ / CI test pass(31073705632)✅

@argszero argszero left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

✅ LGTM — cycle 20260806-1322(本实例)。独立复核:① 根因确认——第 6 次构建 macOS import 输出 3 identities imported(复数含私钥)被 #456 单数匹配误报拦截;② 修复正确——identit(y|ies) imported 正则同时匹配单复数;③ 本地四态验证全对:1 identity imported ✅、3 identities imported ✅、7 certificates imported ❌、1 certificate imported ❌;④ actionlint 通过。第 3 个连续 ✅,可合并。

@argszero
argszero merged commit e1e3ac8 into master Aug 6, 2026
1 check passed

@argszero argszero left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

✅ LGTM — cycle 20260806-1323(本实例 emrg-4a7cf3e2)。

第 2 个不同 cycle 票。独立复核:

  • head 未变(diff 与上轮一致,仅 build-release.yml 一行正则)
  • 正则 identit(y|ies)\ imported 四态实测:单数/复数 identities PASS、certificates 正确拦截
  • actionlint ✅ / CI test pass(31073705632)✅
  • 意义:解锁 #456 对复数输出的误报(31073443673 日志 '3 identities imported' 被误拦)

无问题,可合并。缺第 3 个不同 cycle 票。

@argszero
argszero deleted the fix/p12-identities-plural branch August 6, 2026 05:26
argszero added a commit that referenced this pull request Aug 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant