Skip to content

chore: sync upstream 2026-06-15 - #45

Merged
shudonglin merged 2 commits into
mainfrom
chore/sync-upstream-2026-06-15
Jun 15, 2026
Merged

chore: sync upstream 2026-06-15#45
shudonglin merged 2 commits into
mainfrom
chore/sync-upstream-2026-06-15

Conversation

@shudonglin

Copy link
Copy Markdown

📝 变更描述 / Description

Full -X theirs sync of QuantumNous/new-api main (11 commits ahead). Fork patch alert-bridge.yml restored after sync wipe.

Upstream commits included:

Fork patches verified intact: all 24 patterns in .github/fork-patches.txt pass except alert-bridge.yml (wiped by -X theirs, restored in second commit).

⚠️ This PR was created by the daily maintenance AI agent (Claude). The sync merge and patch restoration are automated; the upstream commits themselves are human-authored.

🚀 变更类型 / Type of change

  • 🐛 Bug 修复 (Bug fix)
  • ✨ 新功能 (New feature)
  • ⚡ 性能优化 / 重构 (Refactor)
  • 📝 文档更新 (Documentation)

🔗 关联任务 / Related Issue

N/A — routine upstream sync

✅ 提交前检查项 / Checklist

  • 非重复提交: No duplicate sync PR exists for 2026-06-15.
  • 变更理解: Sync merge with -X theirs; fork patches verified.
  • 范围聚焦: Only upstream sync commits + alert-bridge.yml restore.
  • 安全合规: No credentials; fork security patches intact.

📸 运行证明 / Proof of Work

Fork was 11 commits behind upstream/main. All 24 fork patch patterns verified OK post-merge (1 restored: alert-bridge.yml). CI will confirm build health.


Generated by Claude Code

@shudonglin
shudonglin merged commit 9281c42 into main Jun 15, 2026
5 checks passed
@shudonglin
shudonglin deleted the chore/sync-upstream-2026-06-15 branch June 15, 2026 05:39
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.

2 participants