fixed bugs, enabled osx-arm wheel

Signed-off-by: Krzysztof Milde <[email protected]>

Author: mildek

.github/workflows/conda.yml

@@ -81,24 +81,13 @@ jobs:
         - uses: mamba-org/setup-micromamba@v2
           with:
             micromamba-version: '2.3.2-0'
-            environment-file: conda/dev-environment-linux.yml
+            environment-file: conda/dev-environment-unix.yml
             init-shell: >-
               bash
             cache-environment: true
             cache-downloads: true
             post-cleanup: 'all'
-          if: ${{ runner.os == 'Linux' }}
-
-        - uses: mamba-org/setup-micromamba@v2
-          with:
-            micromamba-version: '2.3.2-0'
-            environment-file: conda/dev-environment-osx.yml
-            init-shell: >-
-              bash
-            cache-environment: true
-            cache-downloads: true
-            post-cleanup: 'all'
-          if: ${{ runner.os == 'macOS' }}
+          if: ${{ runner.os != 'Windows' }}
 
         - uses: mamba-org/setup-micromamba@v2
           with:

conda/dev-environment-osx.yml

@@ -3,8 +3,9 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-#  - bison  # not available on windows
  - astor
+ - avrocpp
+#  - bison  # not available on windows
  - brotli
  - bump-my-version
  - cmake

conda/dev-environment-linux.yml conda/dev-environment-unix.ymlconda/dev-environment-linux.yml renamed to conda/dev-environment-unix.yml

@@ -3,19 +3,12 @@ cmake_minimum_required(VERSION 3.7.2)
 if (CSP_USE_VCPKG)
   find_package(RdKafka CONFIG REQUIRED)
   find_package(unofficial-avro-cpp CONFIG REQUIRED)
-  set(CSP_HAVE_AVRO ON)
   if(NOT WIN32)
     # Bad, but a temporary workaround for
     # https://github.com/microsoft/vcpkg/issues/40320
     link_directories(${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib)
   endif()
 else()
   find_package(RdKafka REQUIRED)
-  find_package(Avro QUIET)
-  if(Avro_FOUND)
-    set(CSP_HAVE_AVRO ON)
-  else()
-    set(CSP_HAVE_AVRO OFF)
-    message(STATUS "Avro not found - AVRO protocol support will be disabled")
-  endif()
+  find_package(Avro REQUIRED)
 endif()

conda/dev-environment-win.yml

@@ -24,14 +24,11 @@ find_package(DepsKafkaAdapter REQUIRED)
 
 target_link_libraries(csp_kafka_adapter PUBLIC csp_adapter_utils RdKafka::rdkafka RdKafka::rdkafka++)
 
-# Link Avro library if available
-if(CSP_HAVE_AVRO)
-  target_compile_definitions(csp_kafka_adapter PUBLIC CSP_HAVE_AVRO)
-  if(CSP_USE_VCPKG)
-    target_link_libraries(csp_kafka_adapter PUBLIC unofficial::avro-cpp::avrocpp)
-  else()
-    target_link_libraries(csp_kafka_adapter PUBLIC Avro::avrocpp)
-  endif()
+# Link Avro library
+if(CSP_USE_VCPKG)
+  target_link_libraries(csp_kafka_adapter PUBLIC unofficial::avro-cpp::avrocpp)
+else()
+  target_link_libraries(csp_kafka_adapter PUBLIC Avro::avrocpp)
 endif()
 
 install(TARGETS csp_kafka_adapter

cpp/cmake/modules/FindDepsKafkaAdapter.cmake

@@ -3,9 +3,7 @@
 #include <csp/adapters/kafka/KafkaPublisher.h>
 #include <csp/adapters/utils/MessageWriter.h>
 #include <csp/adapters/utils/JSONMessageWriter.h>
-#ifdef CSP_HAVE_AVRO
 #include <csp/adapters/utils/AvroMessageWriter.h>
-#endif
 
 #include <librdkafka/rdkafkacpp.h>
 
@@ -20,10 +18,8 @@ KafkaPublisher::KafkaPublisher( KafkaAdapterManager * mgr, const Dictionary & pr
     auto protocol = properties.get<std::string>( "protocol" );
     if( protocol == "JSON" )
         m_msgWriter = std::make_shared<utils::JSONMessageWriter>( properties );
-#ifdef CSP_HAVE_AVRO
     else if( protocol == "AVRO" )
         m_msgWriter = std::make_shared<utils::AvroMessageWriter>( properties );
-#endif
     else if( protocol != "RAW_BYTES" )
         CSP_THROW( NotImplemented, "msg protocol " << protocol << " not currently supported for kafka output adapters" );
 }