From ecd00e0437d307dcb9bcac1f5a66c38f4cfcc64e Mon Sep 17 00:00:00 2001 From: Aliaksandr Adziareika <8034372+alexadereyko@users.noreply.github.com> Date: Thu, 23 Jul 2026 11:06:05 +0200 Subject: [PATCH 1/3] Move to resuable@v2 in order to setup openssl dependency --- .github/workflows/ci-downstream.yml | 34 ++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-downstream.yml b/.github/workflows/ci-downstream.yml index d54d780..cec2d88 100644 --- a/.github/workflows/ci-downstream.yml +++ b/.github/workflows/ci-downstream.yml @@ -12,13 +12,45 @@ 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"] + }, + { + "match-jobs": ["windows-*-x86-*"], + "choco-install": ["openssl --x86"] + } + ] cmake-presets: > [ { "configure-preset": "module", "test-preset": "module-test" + }, + { + "match-jobs": ["windows-*-x86-*"], + "cache-variables": { "OPENSSL_ROOT_DIR": "C:/Program Files (x86)/OpenSSL-Win32" } } ] From 031ccdb35f7453753d5594768a0fc9eb2bd8786c Mon Sep 17 00:00:00 2001 From: Aliaksandr Adziareika <8034372+alexadereyko@users.noreply.github.com> Date: Thu, 23 Jul 2026 11:34:23 +0200 Subject: [PATCH 2/3] Setup ubuntu gcc-7 x86 job --- .github/workflows/ci-downstream.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-downstream.yml b/.github/workflows/ci-downstream.yml index cec2d88..3561ea5 100644 --- a/.github/workflows/ci-downstream.yml +++ b/.github/workflows/ci-downstream.yml @@ -40,7 +40,7 @@ jobs: }, { "match-jobs": ["windows-*-x86-*"], - "choco-install": ["openssl --x86"] + "run": "vcpkg install openssl:x86-windows" } ] cmake-presets: > @@ -51,6 +51,15 @@ jobs: }, { "match-jobs": ["windows-*-x86-*"], - "cache-variables": { "OPENSSL_ROOT_DIR": "C:/Program Files (x86)/OpenSSL-Win32" } + "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" + } } ] From 884d45fd6284fe91d19fe68fda9aa42542595f90 Mon Sep 17 00:00:00 2001 From: Aliaksandr Adziareika <8034372+alexadereyko@users.noreply.github.com> Date: Thu, 23 Jul 2026 12:11:00 +0200 Subject: [PATCH 3/3] Fix missing deps and if-statement assigning for clang --- .github/workflows/ci-downstream.yml | 2 +- .../src/websocket_streaming_client_module_impl.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-downstream.yml b/.github/workflows/ci-downstream.yml index 3561ea5..32ed272 100644 --- a/.github/workflows/ci-downstream.yml +++ b/.github/workflows/ci-downstream.yml @@ -36,7 +36,7 @@ jobs: }, { "match-jobs": ["ubuntu-*-x86-*"], - "apt-install": ["libssl-dev:i386"] + "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-*"], 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;