Better CI builds

This commit is contained in:
momo5502 2022-09-17 09:33:15 +02:00
parent 867de3c3dd
commit ab1b21d9fd
3 changed files with 9 additions and 8 deletions

View File

@ -38,8 +38,7 @@ jobs:
uses: microsoft/setup-msbuild@v1.0.2 uses: microsoft/setup-msbuild@v1.0.2
- name: Generate project files - name: Generate project files
#run: tools/premake5 vs2022 --ci-build run: tools/premake5 vs2022 --ci-build
run: tools/premake5 vs2022
- name: Set up problem matching - name: Set up problem matching
uses: ammaraskar/msvc-problem-matcher@master uses: ammaraskar/msvc-problem-matcher@master

View File

@ -77,6 +77,11 @@ newoption {
description = "Enable development builds of the client." description = "Enable development builds of the client."
} }
newoption {
trigger = "ci-build",
description = "Enable CI builds of the client."
}
newaction { newaction {
trigger = "version", trigger = "version",
description = "Returns the version string for the current commit of the source code.", description = "Returns the version string for the current commit of the source code.",
@ -244,7 +249,7 @@ workspace "boiii"
defines {"DEV_BUILD"} defines {"DEV_BUILD"}
end end
if os.getenv("CI") then if _OPTIONS["ci-build"] then
defines {"CI"} defines {"CI"}
end end

View File

@ -73,10 +73,7 @@ namespace updater
auto res = utils::compression::zip::extract(data); auto res = utils::compression::zip::extract(data);
if (res.size() == 1) if (res.size() == 1)
{ {
for (auto& file : res) return std::move(res.begin()->second);
{
return std::move(file.second);
}
} }
throw std::runtime_error("Invalid data"); throw std::runtime_error("Invalid data");
@ -195,6 +192,6 @@ namespace updater
}; };
} }
#if !defined(DEBUG) && defined(CI) #if defined(NDEBUG) && defined(CI)
REGISTER_COMPONENT(updater::component) REGISTER_COMPONENT(updater::component)
#endif #endif