From d7928aaa6551d96d44e5a6321dc54394cfdfe481 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 6 Jun 2024 00:34:03 +0800 Subject: improve pack to fix config --- xmake/plugins/pack/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/plugins/pack/main.lua b/xmake/plugins/pack/main.lua index d55855143..960bebe03 100644 --- a/xmake/plugins/pack/main.lua +++ b/xmake/plugins/pack/main.lua @@ -116,7 +116,7 @@ function main() project.lock() -- load config first - config.load() + task.run("config", {}, {disable_dump = true}) -- enter project directory local oldir = os.cd(project.directory()) -- cgit v1.3.1 From db24e0460ba6da51033f546426e0512f0c1c988d Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 6 Jun 2024 00:52:31 +0800 Subject: fix test --- tests/projects/c++/modules/test_base.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/projects/c++/modules/test_base.lua b/tests/projects/c++/modules/test_base.lua index 219901c63..80206983a 100644 --- a/tests/projects/c++/modules/test_base.lua +++ b/tests/projects/c++/modules/test_base.lua @@ -36,7 +36,7 @@ end function main(t) if is_subhost("windows") then local clang = find_tool("clang", {version = true}) - if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then + if clang and clang.version and semver.compare(clang.version, "17.0") >= 0 then os.exec("xmake f --toolchain=clang -c --yes") _build() os.exec("xmake clean -a") -- cgit v1.3.1