From 29602041a7381f199c501f046aec30a5af66c1f8 Mon Sep 17 00:00:00 2001 From: Christins <17354303956@163.com> Date: Fri, 21 Nov 2025 16:03:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E8=AF=AF=E5=88=A0=E7=9A=84=E4=B8=9C=E8=A5=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci-macos-arm64.yml | 2 +- xmake.lua | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-macos-arm64.yml b/.github/workflows/ci-macos-arm64.yml index 2a444ff9f..f379c47e2 100644 --- a/.github/workflows/ci-macos-arm64.yml +++ b/.github/workflows/ci-macos-arm64.yml @@ -87,7 +87,7 @@ jobs: key: xmake-build-${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('xmake-requires.lock') }} - name: config - run: xmake config --policies=build.ccache -o ${{ runner.workspace }}/build -m releasedbg --yes + run: xmake config --policies=build.ccache -o ${{ runner.workspace }}/build -m releasedbg -a ${{ matrix.arch }} --yes - name: build run: xmake build --yes -vD stem && xmake build --yes -vD --group=tests #- name: C++ tests diff --git a/xmake.lua b/xmake.lua index 72b7f57fd..06e84b7a3 100644 --- a/xmake.lua +++ b/xmake.lua @@ -64,6 +64,10 @@ add_configfiles("src/System/config.h.xmake", { -- support cygwin env. set_allowedplats("linux", "macosx", "windows") +if is_plat("windows") then + set_runtimes("MT") +end + if is_plat("linux") then set_configvar("OS_GNU_LINUX", true) else -- Gitee From 6f21879e6cf7cf2cdfbb862e66a64d65cb914970 Mon Sep 17 00:00:00 2001 From: Christins <17354303956@163.com> Date: Fri, 21 Nov 2025 16:06:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devel/200_6.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devel/200_6.md b/devel/200_6.md index 94443a9b2..c41f59302 100644 --- a/devel/200_6.md +++ b/devel/200_6.md @@ -22,6 +22,8 @@ - 提供 `hdiutil` 作为备用方案,增加重试机制 - 添加临时文件清理和资源释放逻辑 +恢复了一个交叉编译的参数,一个Windows平台运行时的选项 + ## 2025/10/05 CD for macOS ## What -- Gitee From ca8d6bfee7a65ffded6c0d2b7a8d763e9c2e21d2 Mon Sep 17 00:00:00 2001 From: Christins <17354303956@163.com> Date: Fri, 21 Nov 2025 16:15:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devel/200_6.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/devel/200_6.md b/devel/200_6.md index c41f59302..c955b3960 100644 --- a/devel/200_6.md +++ b/devel/200_6.md @@ -1,5 +1,9 @@ # 200_6 Github Action支持macOS的构建和测试 +## 2025/11/21 +## What 恢复误删代码 +恢复了一个交叉编译的参数,一个Windows平台运行时的选项 + ## 2025/11/21 在macOS平台采用create-dmg制作dmg安装包 ## What 1. **CD工作流改进**: @@ -22,9 +26,6 @@ - 提供 `hdiutil` 作为备用方案,增加重试机制 - 添加临时文件清理和资源释放逻辑 -恢复了一个交叉编译的参数,一个Windows平台运行时的选项 - - ## 2025/10/05 CD for macOS ## What 删除CD里的pandoc相关 -- Gitee From ca02e4c57beebfb37076682b11a08d1e23d5eacc Mon Sep 17 00:00:00 2001 From: Christins <17354303956@163.com> Date: Fri, 21 Nov 2025 16:16:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devel/200_6.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/200_6.md b/devel/200_6.md index c955b3960..265dce515 100644 --- a/devel/200_6.md +++ b/devel/200_6.md @@ -1,7 +1,7 @@ # 200_6 Github Action支持macOS的构建和测试 -## 2025/11/21 -## What 恢复误删代码 +## 2025/11/21 恢复误删代码 +## What 恢复了一个交叉编译的参数,一个Windows平台运行时的选项 ## 2025/11/21 在macOS平台采用create-dmg制作dmg安装包 -- Gitee