Merge branch 'main' into 488-in-the-http_server_extension_ts-the-effe…

…cts-of-the-first-two-lines-below-are-overridden-by-the-third-line-which-likely-isnt-the-intended-behavior
TEN-framework · Jan 3, 2025 · 04644fb · 04644fb
2 parents d6935ee + 9524054
commit 04644fb
Show file tree

Hide file tree

Showing 24 changed files with 380 additions and 857 deletions.
diff --git a/build/ten_runtime/feature/cmake.py b/build/ten_runtime/feature/cmake.py
@@ -345,7 +345,7 @@ def build(self):
             + f" --target {self.args.project_name}"
         )
 
-        if self.args.target_os != "win":
+        if self.args.target_os != "win" and self.args.target_os != "mac":
             cmd += " --parallel $(nproc)"
 
         if self.args.log_level > 1:

diff --git a/core/src/ten_rust/src/schema/bindings_703136.rs.tmp b/core/src/ten_rust/src/schema/bindings_703136.rs.tmp
diff --git a/docs/ten_framework/dependencies.md b/docs/ten_framework/dependencies.md
@@ -32,7 +32,7 @@ This is one of the event loop libraries used in the TEN runtime. Please refer to
 
 ## msgpack-c
 
-Version: 6.0.0
+Version: 6.1.0
 
 [Boost Software License, Version 1.0](https://github.com/msgpack/msgpack-c#license)
 

diff --git a/third_party/msgpack/.github/workflows/coverage.yml b/third_party/msgpack/.github/workflows/coverage.yml
diff --git a/third_party/msgpack/.github/workflows/gha.yml b/third_party/msgpack/.github/workflows/gha.yml
diff --git a/third_party/msgpack/.gitignore b/third_party/msgpack/.gitignore
diff --git a/third_party/msgpack/AUTHORS b/third_party/msgpack/AUTHORS