win32: combine #892 + #893 and fix all remaining Windows CI failures

.github/workflows/ossia-pd.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Build
         shell: cmd
         run: |
-          cmake -B build -S %GITHUB_WORKSPACE% -GNinja -DOSSIA_PD_ONLY=1 -DOSSIA_CI=1 -DCMAKE_SYSTEM_VERSION=7 -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release
+          cmake -B build -S %GITHUB_WORKSPACE% -GNinja -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DOSSIA_PD_ONLY=1 -DOSSIA_CI=1 -DCMAKE_SYSTEM_VERSION=7 -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release
           cmake --build build
           cmake --install build
 
@@ -72,7 +72,7 @@ jobs:
       - uses: ./.github/actions/latest-ubuntu-toolchain
       - name: Build
         run: |
-          cmake -B build -S ${GITHUB_WORKSPACE} -GNinja -DOSSIA_CI=1 -DCMAKE_BUILD_TYPE=Release -DOSSIA_PD_ONLY=1 -DCMAKE_INSTALL_PREFIX=install
+          cmake -B build -S ${GITHUB_WORKSPACE} -GNinja -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DOSSIA_CI=1 -DCMAKE_BUILD_TYPE=Release -DOSSIA_PD_ONLY=1 -DCMAKE_INSTALL_PREFIX=install
           cmake --build build
           cmake --build build --target install
       - name: Archive Package

.github/workflows/ossia-purrdata.yml

@@ -56,7 +56,7 @@ jobs:
       - name: Build
         shell: cmd
         run: |
-          cmake -B build -S %GITHUB_WORKSPACE% -GNinja -DOSSIA_PD_ONLY=1 -DOSSIA_PURR_DATA=1 -DOSSIA_CI=1 -DCMAKE_SYSTEM_VERSION=7 -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release
+          cmake -B build -S %GITHUB_WORKSPACE% -GNinja -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DOSSIA_PD_ONLY=1 -DOSSIA_PURR_DATA=1 -DOSSIA_CI=1 -DCMAKE_SYSTEM_VERSION=7 -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release
           cmake --build build
           cmake --install build
 
@@ -75,6 +75,7 @@ jobs:
         run: |
           cmake -B build -S ${GITHUB_WORKSPACE} \
             -GNinja \
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
             -DOSSIA_PURR_DATA=1 \
             -DOSSIA_CI=1 \
             -DCMAKE_BUILD_TYPE=Release \

cmake/deps/fmt.cmake

@@ -15,7 +15,6 @@ if(NOT TARGET fmt::fmt)
         FMT_LIB_EXPORT=1
       PUBLIC
         FMT_USE_LONG_DOUBLE=0
-        FMT_USE_INT128=0
         FMT_USE_FLOAT128=0
         FMT_STATIC_THOUSANDS_SEPARATOR=1
       INTERFACE
@@ -29,7 +28,6 @@ if(NOT TARGET fmt::fmt)
         FMT_HEADER_ONLY=1
 
         FMT_USE_LONG_DOUBLE=0
-        FMT_USE_INT128=0
         FMT_USE_FLOAT128=0
         FMT_STATIC_THOUSANDS_SEPARATOR=1
     )

cmake/ossiaConfig.cmake.in

@@ -25,7 +25,6 @@ else()
 target_compile_definitions(ossia::ossia INTERFACE
   FMT_HEADER_ONLY=1
   FMT_USE_LONG_DOUBLE=0
-  FMT_USE_INT128=0
   FMT_USE_FLOAT128=0
   FMT_STATIC_THOUSANDS_SEPARATOR=1
 

src/ossia/network/value/format_value.hpp

@@ -10,7 +10,14 @@
 
 #include <fmt/ranges.h>
 FMT_BEGIN_NAMESPACE
-#if FMT_VERSION >= 100000
+#if FMT_VERSION >= 120200
+// fmt 12 renamed detail::is_container_adaptor_like -> is_container_adaptor and
+// promoted it out of the detail namespace into fmt itself.
+template <typename T> struct is_container_adaptor<boost::container::flat_set<T>>
+    : std::false_type {
+
+};
+#elif FMT_VERSION >= 100000
 namespace detail {
 template <typename T> class is_container_adaptor_like<boost::container::flat_set<T>>
     : public std::false_type {

tests/Network/WSLogger.cpp

@@ -26,6 +26,7 @@ TEST_CASE("test_websockets_log_no_connection", "test_websockets_log_no_connectio
 
 TEST_CASE("test_websockets_log_connection", "test_websockets_log_connection")
 {
+  using namespace std::chrono;
   bool opened = false;
   bool message = false;
   bool closed = false;
@@ -39,18 +40,37 @@ TEST_CASE("test_websockets_log_connection", "test_websockets_log_connection")
   srv.set_close_handler([&](auto&&...) { closed = true; });
   srv.listen(5567);
 
+  // The client connects from its own thread (websocket_threaded_connection)
+  // while the server's io_context is pumped from here. On slow or loaded CI
+  // machines - especially the static Debug Windows build - the cross-thread
+  // handshake routinely takes longer than the fixed 100ms windows this test
+  // used to rely on, which led to spurious "opened == false" failures. Pump
+  // the context until each step is actually observed instead, with a generous
+  // upper bound so a genuine regression still fails in reasonable time.
+  auto& io = ctx->context;
+  auto pump_until = [&](auto&& predicate) {
+    const auto deadline = steady_clock::now() + seconds(15);
+    while(!predicate() && steady_clock::now() < deadline)
+    {
+      if(io.stopped())
+        io.restart();
+      io.run_for(milliseconds(20));
+    }
+  };
+
   {
     ossia::string_view host = "ws://127.0.0.1:5567";
     std::string appname = "foo";
 
     auto con = std::make_shared<ossia::websocket_threaded_connection>(std::string(host));
     auto sink = std::make_shared<websocket_log_sink>(con, appname);
     auto log = std::make_shared<spdlog::logger>("max_logger", sink);
-    ctx->context.run_for(std::chrono::milliseconds(100));
+
+    pump_until([&] { return opened; });
     log->info("helo");
-    ctx->context.run_for(std::chrono::milliseconds(100));
+    pump_until([&] { return message; });
   }
-  ctx->context.run_for(std::chrono::milliseconds(100));
+  pump_until([&] { return closed; });
 
   REQUIRE(opened);
   REQUIRE(message);

tests/catch/include_catch.hpp

@@ -8,3 +8,11 @@
 #endif
 #include <iostream>
 #include <fstream>
+
+#if defined(_WIN32)
+#include <winsock2.h>
+static const struct ossia_test_winsock_owner {
+  ossia_test_winsock_owner() { WSADATA d; ::WSAStartup(MAKEWORD(2, 2), &d); }
+  ~ossia_test_winsock_owner() { ::WSACleanup(); }
+} ossia_test_winsock_owner_instance;
+#endif