diff --git a/.github/workflows/ci-downstream.yml b/.github/workflows/ci-downstream.yml index d54d780..32ed272 100644 --- a/.github/workflows/ci-downstream.yml +++ b/.github/workflows/ci-downstream.yml @@ -12,13 +12,54 @@ on: jobs: call-opendaq-reusable: name: LT Streaming Modern - uses: openDAQ/openDAQ-CI/.github/workflows/reusable.yml@v1 + uses: openDAQ/openDAQ-CI/.github/workflows/reusable.yml@v2 with: opendaq-ref: ${{ github.event.inputs.opendaq-ref || '' }} + include-jobs: > + [ + "windows-2022-x86-msvs-v143-release", + "windows-2022-x86_64-msvs-v143-debug", + "ubuntu-20.04-x86-ninja-gcc-7-release", + "ubuntu-20.04-x86_64-ninja-clang-9-release", + "ubuntu-24.04-x86_64-ninja-gcc-14-debug", + "ubuntu-24.04-x86_64-ninja-gcc-14-release", + "ubuntu-24.04-x86_64-ninja-clang-18-release", + "macos-15-x86_64-ninja-appleclang-release", + "macos-26-x86_64-ninja-appleclang-debug", + "macos-26-armv8-ninja-appleclang-release" + ] + packages: > + [ + { + "match-jobs": ["ubuntu-*-x86_64-*"], + "apt-install": ["libssl-dev"] + }, + { + "match-jobs": ["ubuntu-*-x86-*"], + "apt-install": ["libssl-dev:i386", "lld", "libx11-dev:i386", "libxi-dev:i386", "libxcursor-dev:i386", "libxrandr-dev:i386", "libgl-dev:i386", "libudev-dev:i386", "libfreetype6-dev:i386"] + }, + { + "match-jobs": ["windows-*-x86-*"], + "run": "vcpkg install openssl:x86-windows" + } + ] cmake-presets: > [ { "configure-preset": "module", "test-preset": "module-test" + }, + { + "match-jobs": ["windows-*-x86-*"], + "cache-variables": { "OPENSSL_ROOT_DIR": "C:/vcpkg/installed/x86-windows" } + }, + { + "match-jobs": ["ubuntu-*-x86-*"], + "cache-variables": { + "OPENDAQ_FORCE_COMPILE_32BIT": true, + "OPENDAQ_GENERATE_PYTHON_BINDINGS": false, + "OPENDAQ_GENERATE_CSHARP_BINDINGS": false, + "CMAKE_CXX_FLAGS_INIT": "-Wno-error=shift-count-overflow" + } } ] diff --git a/modules/websocket_streaming_client_module/src/websocket_streaming_client_module_impl.cpp b/modules/websocket_streaming_client_module/src/websocket_streaming_client_module_impl.cpp index 2afd4e5..a20eda0 100644 --- a/modules/websocket_streaming_client_module/src/websocket_streaming_client_module_impl.cpp +++ b/modules/websocket_streaming_client_module/src/websocket_streaming_client_module_impl.cpp @@ -281,12 +281,12 @@ StringPtr WebsocketStreamingClientModule::formConnectionString(const StringPtr& if (outParams->port == 0 && config.assigned()) { - if (portFromConfig = (isSecure && config.hasProperty(PROPERTY_WSS_STREAMING_PORT_CLIENT))) + if ((portFromConfig = (isSecure && config.hasProperty(PROPERTY_WSS_STREAMING_PORT_CLIENT)))) { outParams->port = config.getPropertyValue(PROPERTY_WSS_STREAMING_PORT_CLIENT); portFromConfigIsDefault = outParams->port == DEFAULT_WSS_STREAMING_PORT; } - else if (portFromConfig = (!isSecure && config.hasProperty(PROPERTY_WS_STREAMING_PORT_CLIENT))) + else if ((portFromConfig = (!isSecure && config.hasProperty(PROPERTY_WS_STREAMING_PORT_CLIENT)))) { outParams->port = config.getPropertyValue(PROPERTY_WS_STREAMING_PORT_CLIENT); portFromConfigIsDefault = outParams->port == DEFAULT_WS_STREAMING_PORT;