Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "Vcpkg target triplet" FORCE)
endif()

project(acecode VERSION 1.0.15 LANGUAGES C CXX)
project(acecode VERSION 1.0.16 LANGUAGES C CXX)

include(${CMAKE_SOURCE_DIR}/cmake/acecode_source_guards.cmake)

Expand Down Expand Up @@ -105,7 +105,7 @@
set(ACECODE_WEB_DIST "${CMAKE_SOURCE_DIR}/web/dist")
set(ACECODE_WEB_EMBED_DIR "${ACECODE_WEB_DIST}")
if(NOT EXISTS "${ACECODE_WEB_DIST}")
message(WARNING

Check warning on line 108 in CMakeLists.txt

View workflow job for this annotation

GitHub Actions / unit-tests (linux-x64)

[acecode] web/dist/ not found — embedding a minimal fallback page. Run
"[acecode] web/dist/ not found — embedding a minimal fallback page. "
"Run `pnpm install && pnpm build` inside web/ before re-configuring for the full UI.")
set(ACECODE_WEB_EMBED_DIR "${CMAKE_BINARY_DIR}/generated/web-dist-fallback")
Expand Down
8 changes: 6 additions & 2 deletions tests/desktop/daemon_pool_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <chrono>
#include <filesystem>
#include <fstream>
#include <limits>
#include <mutex>
#include <thread>
#include <vector>
Expand Down Expand Up @@ -444,15 +445,18 @@ TEST(DaemonPool, AttachedDaemonStopsWhenKeepAliveIsDisabled) {
}

TEST(DaemonPool, IncompatibleManagedDaemonIsStoppedBeforeReplacementSpawn) {
// A normal mock PID can belong to an unrelated process on a busy runner.
const auto stopped_pid = (std::numeric_limits<int>::max)();
ASSERT_FALSE(acecode::daemon::is_pid_alive(stopped_pid));
auto state = std::make_shared<MockSupervisor::SharedState>();
DaemonPool pool;
pool.set_supervisor_factory_for_test([&] {
return std::unique_ptr<IDaemonSupervisor>(new MockSupervisor(state));
});
pool.set_existing_daemon_probe_for_test([](const ActivateRequest&) {
pool.set_existing_daemon_probe_for_test([stopped_pid](const ActivateRequest&) {
ExistingDaemonProbeResult existing;
existing.action = ExistingDaemonAction::Replace;
existing.pid = 4242;
existing.pid = stopped_pid;
existing.guid = "old-guid";
existing.reason = "protocol mismatch";
return existing;
Expand Down
12 changes: 7 additions & 5 deletions tests/web/web_server_smoke_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13510,11 +13510,13 @@ std::vector<acecode::ChatMessage> wait_for_user_messages(
std::vector<acecode::ChatMessage> users;
const auto deadline = std::chrono::steady_clock::now() + 10s;
while (std::chrono::steady_clock::now() < deadline) {
users.clear();
for (const auto& message : entry.loop->messages()) {
if (acecode::is_real_user_message(message)) users.push_back(message);
}
if (users.size() >= expected_count && !entry.loop->is_busy()) break;
const bool idle = entry.loop->try_run_idle_control([&] {
users.clear();
for (const auto& message : entry.loop->messages()) {
if (acecode::is_real_user_message(message)) users.push_back(message);
}
});
if (idle && users.size() >= expected_count) break;
std::this_thread::sleep_for(10ms);
}
return users;
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "acecode",
"version-semver": "1.0.15",
"version-semver": "1.0.16",
"dependencies": [
"cpr",
{
Expand Down
Loading