another try fix the windows / macos CIs

Author: xianshijing-lk

.github/workflows/builds.yml

@@ -116,12 +116,30 @@ jobs:
         if: runner.os == 'Windows'
         shell: pwsh
         run: |
+          # Locate SDK root
           $sdkRoot = Get-ChildItem -Directory "build/_deps/livekit-sdk" | Select-Object -First 1
-          if (-not $sdkRoot) { throw "SDK root not found under build/_deps/livekit-sdk" }
+          if (-not $sdkRoot) {
+          throw "SDK root not found under build/_deps/livekit-sdk"
+          }
           Write-Host "SDK root: $($sdkRoot.FullName)"
 
+          # Make sure DLLs are found at runtime
           $env:PATH = "$($sdkRoot.FullName)\bin;$($sdkRoot.FullName)\lib;$env:PATH"
-          .\build\basic_room.exe --help 2>$null
+
+          # Locate the built executable
+          $exe = Get-ChildItem -Recurse build -Filter basic_room.exe | Select-Object -First 1
+          if (-not $exe) {
+            throw "basic_room.exe not found in build directory"
+          }
+
+          Write-Host "Running $($exe.FullName) --help"
+
+          # Try to execute it. We only care that it launches.
+          & $exe.FullName --help 2>$null
+          if ($LASTEXITCODE -ne 0) {
+            Write-Host "basic_room.exe exited with code $LASTEXITCODE (allowed for --help)"
+          }
+
 
       # ---------- upload build output ----------
       - name: Upload binary

cmake/LiveKitSDK.cmake

@@ -1,23 +1,23 @@
 # LiveKitSDK.cmake
 #
-# A small helper for example repos:
+# Helper for example repos:
 # - Downloads the appropriate prebuilt LiveKit C++ SDK release asset for the host OS/arch
-# - Extracts it into a local directory (default: build/_deps/livekit-sdk)
-# - Prepends the extracted prefix to CMAKE_PREFIX_PATH so find_package(LiveKit CONFIG REQUIRED) works
+# - Extracts it into a local directory (default: <build>/_deps/livekit-sdk)
+# - Prepends the extracted prefix to CMAKE_PREFIX_PATH so:
+#     find_package(LiveKit CONFIG REQUIRED)
+#   works out of the box.
 #
 # Usage:
 #   list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 #   include(LiveKitSDK)
-#   livekit_sdk_setup(VERSION "0.1.9" SDK_DIR "${CMAKE_BINARY_DIR}/_deps/livekit-sdk")
-#
-# Latest:
 #   livekit_sdk_setup(VERSION "latest" SDK_DIR "${CMAKE_BINARY_DIR}/_deps/livekit-sdk")
 #
 # Optional:
 #   livekit_sdk_setup(VERSION "latest" REPO "livekit/client-sdk-cpp" GITHUB_TOKEN "$ENV{GITHUB_TOKEN}")
 
 include_guard(GLOBAL)
 
+# -------------------- Host detection --------------------
 function(_lk_detect_host out_os out_arch)
   if(WIN32)
     set(_os "windows")
@@ -29,10 +29,13 @@ function(_lk_detect_host out_os out_arch)
     message(FATAL_ERROR "LiveKitSDK: unsupported host OS")
   endif()
 
+  # Use host processor; normalize common variants (case-insensitive)
   set(_proc "${CMAKE_HOST_SYSTEM_PROCESSOR}")
-  if(_proc MATCHES "^(x86_64|AMD64)$")
+  string(TOLOWER "${_proc}" _proc_l)
+
+  if(_proc_l MATCHES "^(x86_64|amd64)$")
     set(_arch "x64")
-  elseif(_proc MATCHES "^(arm64|aarch64)$")
+  elseif(_proc_l MATCHES "^(arm64|aarch64)$")
     set(_arch "arm64")
   else()
     message(FATAL_ERROR "LiveKitSDK: unsupported host arch: ${_proc}")
@@ -44,8 +47,7 @@ endfunction()
 
 function(_lk_default_triple out_triple)
   _lk_detect_host(_os _arch)
-  set(_triple "${_os}-${_arch}")
-  set(${out_triple} "${_triple}" PARENT_SCOPE)
+  set(${out_triple} "${_os}-${_arch}" PARENT_SCOPE)
 endfunction()
 
 function(_lk_archive_ext out_ext)
@@ -57,7 +59,8 @@ function(_lk_archive_ext out_ext)
   endif()
 endfunction()
 
-# Resolve VERSION="latest" via GitHub API, returning a version without leading "v".
+# -------------------- GitHub API helpers --------------------
+# Resolve VERSION="latest" via GitHub API, returning version without leading "v".
 function(_lk_resolve_latest_version out_version repo download_dir github_token)
   if(NOT download_dir)
     set(download_dir "${CMAKE_BINARY_DIR}/_downloads")
@@ -66,40 +69,56 @@ function(_lk_resolve_latest_version out_version repo download_dir github_token)
 
   set(_api "https://api.github.com/repos/${repo}/releases/latest")
 
-  # Sanitize only the repo part (NOT the whole path)
+  # Sanitize repo for filename
   string(REPLACE "/" "_" _repo_sanitized "${repo}")
   set(_json "${download_dir}/livekit_latest_release_${_repo_sanitized}.json")
 
-  # Build headers as a proper argument list (quoted per header)
+  # Build headers as a proper LIST (each element is one full header line)
   set(_headers
     "User-Agent: cmake-livekit-sdk/1.0"
     "Accept: application/vnd.github+json"
+    "X-GitHub-Api-Version: 2022-11-28"
   )
+
+  # Strip token (defensive: avoids accidental newline causing header splitting)
+  if(NOT "${github_token}" STREQUAL "")
+    string(STRIP "${github_token}" github_token)
+  endif()
+
+  # Use Authorization only if token is non-empty
   if(NOT "${github_token}" STREQUAL "")
-    list(APPEND _headers "Authorization: Bearer ${github_token}")
+    # "token" is broadly compatible
+    list(APPEND _headers "Authorization: token ${github_token}")
+  else()
+    message(STATUS "LiveKitSDK: no GITHUB_TOKEN provided; GitHub API may rate-limit.")
   endif()
 
-  # Pass headers safely: keep each header as ONE argument
-  set(_download_args
+  # Capture LOG for actionable failure output
+  set(_dl_args
     TLS_VERIFY ON
     STATUS _st
+    LOG _log
   )
-  list(APPEND _download_args HTTPHEADER)
-  foreach(h IN LISTS _headers)
-    list(APPEND _download_args "${h}")
+  list(APPEND _dl_args HTTPHEADER)
+  foreach(_h IN LISTS _headers)
+    list(APPEND _dl_args "${_h}")
   endforeach()
-
-  file(DOWNLOAD "${_api}" "${_json}" ${_download_args})
+  file(DOWNLOAD "${_api}" "${_json}" ${_dl_args})
 
   list(GET _st 0 _code)
   list(GET _st 1 _msg)
   if(NOT _code EQUAL 0)
+    message(STATUS "LiveKitSDK: GitHub API download log:\n${_log}")
+    if(EXISTS "${_json}")
+      file(READ "${_json}" _body)
+      message(STATUS "LiveKitSDK: GitHub API response body:\n${_body}")
+    endif()
     message(FATAL_ERROR
       "LiveKitSDK: failed to query latest release from GitHub API\n"
       "API: ${_api}\n"
       "Status: ${_code}\n"
       "Message: ${_msg}\n"
-      "Tip: set GITHUB_TOKEN to avoid rate limits."
+      "Tip: set GITHUB_TOKEN to avoid rate limits, or use VERSION=<fixed>."
     )
   endif()
 
@@ -111,13 +130,12 @@ function(_lk_resolve_latest_version out_version repo download_dir github_token)
     message(FATAL_ERROR "LiveKitSDK: GitHub API response missing tag_name")
   endif()
 
-  # Strip leading "v" if present (v0.2.0 -> 0.2.0)
+  # Strip leading "v" if present
   string(REGEX REPLACE "^v" "" _ver "${_tag}")
   set(${out_version} "${_ver}" PARENT_SCOPE)
 endfunction()
 
-
-# Public:
+# -------------------- Public entrypoint --------------------
 # livekit_sdk_setup(
 #   VERSION <ver|latest>
 #   SDK_DIR <dir>
@@ -131,40 +149,35 @@ endfunction()
 function(livekit_sdk_setup)
   set(options NO_DOWNLOAD)
   set(oneValueArgs VERSION SDK_DIR REPO SHA256 TRIPLE DOWNLOAD_DIR GITHUB_TOKEN)
-  set(multiValueArgs)
-  cmake_parse_arguments(LK "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+  cmake_parse_arguments(LK "${options}" "${oneValueArgs}" "" ${ARGN})
 
   if(NOT LK_VERSION)
     message(FATAL_ERROR "livekit_sdk_setup: VERSION is required (use \"latest\" if desired)")
   endif()
-
   if(NOT LK_SDK_DIR)
     message(FATAL_ERROR "livekit_sdk_setup: SDK_DIR is required")
   endif()
 
   if(NOT LK_REPO)
     set(LK_REPO "livekit/client-sdk-cpp")
   endif()
-
   if(NOT LK_DOWNLOAD_DIR)
     set(LK_DOWNLOAD_DIR "${CMAKE_BINARY_DIR}/_downloads")
   endif()
-
   if(NOT LK_TRIPLE)
     _lk_default_triple(LK_TRIPLE)
   endif()
 
-  # If VERSION is "latest", resolve it first.
+  # Resolve latest tag if requested
   set(_resolved_version "${LK_VERSION}")
   if(LK_VERSION STREQUAL "latest")
-    # SHA256 cannot be reliably used with "latest" (changes over time).
     if(LK_SHA256)
       message(WARNING "LiveKitSDK: SHA256 was provided but VERSION=latest; ignoring SHA256.")
       set(LK_SHA256 "")
     endif()
 
     if(NOT LK_GITHUB_TOKEN)
-      # Try env var by default (common in GitHub Actions).
+      # Common in CI if you set env: GITHUB_TOKEN: ${{ github.token }}
       set(LK_GITHUB_TOKEN "$ENV{GITHUB_TOKEN}")
     endif()
 
@@ -176,13 +189,13 @@ function(livekit_sdk_setup)
   set(_archive "livekit-sdk-${LK_TRIPLE}-${_resolved_version}.${_ext}")
   set(_url "https://github.com/${LK_REPO}/releases/download/v${_resolved_version}/${_archive}")
 
-  set(_dl_dir "${LK_DOWNLOAD_DIR}")
-  set(_archive_path "${_dl_dir}/${_archive}")
+  set(_archive_path "${LK_DOWNLOAD_DIR}/${_archive}")
 
-  # Extracted root folder name (matches your bundle root)
+  # The archive is expected to contain a top-level folder named:
+  #   livekit-sdk-<triple>-<version>/
   set(_extracted_root "${LK_SDK_DIR}/livekit-sdk-${LK_TRIPLE}-${_resolved_version}")
 
-  file(MAKE_DIRECTORY "${_dl_dir}")
+  file(MAKE_DIRECTORY "${LK_DOWNLOAD_DIR}")
   file(MAKE_DIRECTORY "${LK_SDK_DIR}")
 
   if(NOT EXISTS "${_extracted_root}")
@@ -194,30 +207,35 @@ function(livekit_sdk_setup)
     endif()
 
     message(STATUS "LiveKitSDK: downloading ${_url}")
+
     if(LK_SHA256)
       file(DOWNLOAD "${_url}" "${_archive_path}"
         SHOW_PROGRESS
         TLS_VERIFY ON
         EXPECTED_HASH "SHA256=${LK_SHA256}"
         STATUS _st
+        LOG _log
       )
     else()
       file(DOWNLOAD "${_url}" "${_archive_path}"
         SHOW_PROGRESS
         TLS_VERIFY ON
         STATUS _st
+        LOG _log
       )
     endif()
 
     list(GET _st 0 _code)
     list(GET _st 1 _msg)
     if(NOT _code EQUAL 0)
+      message(STATUS "LiveKitSDK: download log:\n${_log}")
       message(FATAL_ERROR "LiveKitSDK: download failed\nURL: ${_url}\nStatus: ${_code}\nMessage: ${_msg}")
     endif()
 
-    message(STATUS "LiveKitSDK: extracting ${_archive_path}")
+    # Remove any previous partial extraction
     file(REMOVE_RECURSE "${_extracted_root}")
 
+    message(STATUS "LiveKitSDK: extracting ${_archive_path}")
     file(ARCHIVE_EXTRACT
       INPUT "${_archive_path}"
       DESTINATION "${LK_SDK_DIR}"