Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion .github/workflows/ci-downstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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; Add-Content -Path $env:GITHUB_PATH -Value C:\\vcpkg\\installed\\x86-windows\\bin -Encoding utf8"
}
]
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"
}
}
]
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,8 @@ add_subdirectory(external)
add_subdirectory(shared)
add_subdirectory(modules)

# End-to-end integration tests need both modules present
if (${REPO_OPTION_PREFIX}_ENABLE_TESTS AND ${REPO_OPTION_PREFIX}_ENABLE_CLIENT AND ${REPO_OPTION_PREFIX}_ENABLE_SERVER)
add_subdirectory(tests)
endif()

7 changes: 3 additions & 4 deletions external/ws-streaming/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ set(WS_STREAMING_INSTALL OFF)

opendaq_dependency(
NAME ws-streaming
REQUIRED_VERSION 3.0.7
REQUIRED_VERSION 3.0.8
GIT_REPOSITORY https://github.com/openDAQ/ws-streaming
GIT_REF 9d591b39ec4845a9f65c558411d809800d455a5d
GIT_REF tls
GIT_SHALLOW OFF
EXPECT_TARGET ws-streaming::ws-streaming
PATCH_FILES
${CMAKE_CURRENT_SOURCE_DIR}/patches/0001-Fixes-plus.patch
)
Loading
Loading