Skip to content

[1111] 引入 doctest 2.4.11 源码并迁移 lolly CI#3804

Merged
da-liii merged 17 commits into
mainfrom
da/1111/doctest
Jun 25, 2026
Merged

[1111] 引入 doctest 2.4.11 源码并迁移 lolly CI#3804
da-liii merged 17 commits into
mainfrom
da/1111/doctest

Conversation

@da-liii

@da-liii da-liii commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

摘要

  • 将 doctest 2.4.11 单头文件源码引入 3rdparty/doctest
  • 在主 xmake.lua 定义本地 liii-doctest 包,替换 moebius/lolly 中的远程 doctest 依赖
  • 迁移 lolly/.github/workflows/ 到顶层 .github/workflows/
  • 升级 runner 版本(macos-11 → macos-14,windows-2019 → windows-2025)并统一 xmake 版本到 v3.0.4

测试

  • xmake f --enable_tests=y --yes
  • xmake test moebius_tests/tree_test
  • xmake test lolly_tests/string_u16_test
  • 新增 YAML 文件语法校验通过

🤖 Generated with Claude Code

da-liii and others added 17 commits June 24, 2026 21:12
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
- 将 doctest 2.4.11 单头文件源码放入 3rdparty/doctest
- 在主 xmake.lua 定义本地 liii-doctest 包
- moebius/lolly 改用 liii-doctest 并移除版本约束
- 迁移 lolly CI 到顶层 .github/workflows,升级 runner 与 xmake 版本

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
- 使用 add_includedirs 同时暴露 include 与 include/doctest
- on_install 直接复制整个 doctest 目录,与上游保持一致
- on_test 使用 check_cxxsnippets 进行编译运行测试

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
- 在 3rdparty/doctest.lua 中定义 liii-doctest 本地包
- 在 xmake.lua 中通过 includes 引入
- 文件头注明源自 xmake-io/xmake-repo,Apache-2.0 许可

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
- 增加 macOS CI 构建验证步骤
- 记录 QWKCore/QWKWidgets 中 $(buildir) 修复方案

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
在 on_load 中使用 import("core.project.config") + config.builddir() 替代
$(buildir) 变量,避免在某些 xmake 版本/配置下解析为空字符串导致
mkdir 尝试在根目录创建 /include/QWKCore 而失败。

- QWKCore: os.mkdir、safe_vcp、config_path 改用 path.join(builddir, ...)
- QWKCore: add_includedirs、add_headerfiles 改用 $(builddir)
- QWKWidgets: 同上处理

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

@MoonL79 MoonL79 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@da-liii da-liii merged commit 3cddf36 into main Jun 25, 2026
14 checks passed
@da-liii da-liii deleted the da/1111/doctest branch June 25, 2026 07:18
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