ci: hardcode logging type lttng for now

emqx · Sep 5, 2023 · 8aff2a7 · 8aff2a7
1 parent ca73cbf
commit 8aff2a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -103,8 +103,8 @@ jobs:
           export CMAKE_BUILD_TYPE
           export QUIC_TLS
           export QUIC_ENABLE_LOGGING
-          if "${QUIC_ENABLE_LOGGING}" == "ON" ; then
-
+          if [ "${QUIC_ENABLE_LOGGING}" == "ON" ] ; then
+            export QUIC_LOGGING_TYPE=lttng
             sudo apt-add-repository ppa:lttng/stable-2.13
             sudo apt-get update
             sudo apt-get install -y lttng-tools  babeltrace liblttng-ust-dev lttng-modules-dkms-

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -134,7 +134,7 @@ set_target_properties(quicer_nif
         LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/priv/
 )
 
-if (QUIC_ENABLE_LOGGING AND QUIC_LOGGING_TYPE STREQUAL "lttng")
+if (QUIC_ENABLE_LOGGING STREQUAL "ON" AND QUIC_LOGGING_TYPE STREQUAL "lttng")
   set_target_properties(msquic.lttng PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/priv)
   set_target_properties(msquic.lttng PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/priv)
 endif()