Merge remote-tracking branch 'origin/topic/robin/update-3rdparty'

* origin/topic/robin/update-3rdparty: Fix for Windows compilation. Revert spdlog submodule to release version. Revert dependabout grouping. Bump the 3rdparty group across 1 directory with 10 updates
zeek · Jul 5, 2024 · d04ef6a · d04ef6a
2 parents af61c53 + 745641c
commit d04ef6a
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,10 +6,6 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    groups:
-      3rdparty:
-        patterns:
-        - "3rdparty/*"
 
   - package-ecosystem: "github-actions"
     directory: "/"

diff --git a/3rdparty/IXWebSocket b/3rdparty/IXWebSocket
diff --git a/3rdparty/bpftool b/3rdparty/bpftool
diff --git a/3rdparty/broker b/3rdparty/broker
diff --git a/3rdparty/filesystem b/3rdparty/filesystem
diff --git a/3rdparty/fmt b/3rdparty/fmt
diff --git a/3rdparty/glob b/3rdparty/glob
diff --git a/3rdparty/json b/3rdparty/json
diff --git a/3rdparty/pfs b/3rdparty/pfs
diff --git a/3rdparty/spdlog b/3rdparty/spdlog
diff --git a/3rdparty/vcpkg b/3rdparty/vcpkg
diff --git a/src/core/logger.cc b/src/core/logger.cc
@@ -4,6 +4,7 @@
 
 #include "autogen/config.h"
 #include "core/configuration.h"
+#include "util/filesystem.h"
 
 #include <memory>
 #include <string>
@@ -65,7 +66,7 @@ Result<Nothing> zeek::agent::setGlobalLogger(options::LogType type, options::Log
             if ( ! path )
                 return result::Error("file logging requires a path");
 
-            sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(path->string());
+            sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(path_to_spdlog_filename(*path));
             break;
     }
 

diff --git a/src/util/filesystem.h b/src/util/filesystem.h
@@ -7,6 +7,7 @@
 #include <string>
 
 #include <ghc/filesystem.hpp>
+#include <spdlog/common.h>
 
 /** Type alias. */
 namespace filesystem = ghc::filesystem;
@@ -18,8 +19,10 @@ namespace platform::windows {
 std::string narrowWstring(const std::wstring& wstr); // provided by platform.cc
 } // namespace platform::windows
 inline std::string path_to_string(const filesystem::path& p) { return platform::windows::narrowWstring(p.native()); }
+inline spdlog::filename_t path_to_spdlog_filename(const filesystem::path& p) { return p.wstring(); }
 #else
 inline std::string path_to_string(const filesystem::path& p) { return p.native(); }
+inline spdlog::filename_t path_to_spdlog_filename(const filesystem::path& p) { return p.string(); }
 #endif
 
 } // namespace zeek::agent