From 6eedffcb579a97fa31a172275226efefa83eb0f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Tue, 22 Sep 2026 11:42:59 +0200 Subject: [PATCH 01/15] Added CI Staging to MQTT module --- .github/workflows/check-core-staging.yml | 35 ++++++++ .github/workflows/cleanup.yml | 24 +++++ .github/workflows/stage.yml | 109 +++++++++++++++++++++++ cmake/Packing.cmake | 53 +++++++++++ 4 files changed, 221 insertions(+) create mode 100644 .github/workflows/check-core-staging.yml create mode 100644 .github/workflows/cleanup.yml create mode 100644 .github/workflows/stage.yml create mode 100644 cmake/Packing.cmake diff --git a/.github/workflows/check-core-staging.yml b/.github/workflows/check-core-staging.yml new file mode 100644 index 0000000..e632ca5 --- /dev/null +++ b/.github/workflows/check-core-staging.yml @@ -0,0 +1,35 @@ +name: Check core staging + +on: + pull_request: + types: [opened, reopened, synchronize, ready_for_review] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + core-staging: + name: Core staging + runs-on: ubuntu-latest + permissions: + contents: read + packages: read + steps: + - uses: actions/checkout@v4 + + - uses: openDAQ/openDAQ-CI/.github/actions/resolve-channel@v3 + id: channel + + - name: Read the pinned core ref + shell: bash + run: echo "CORE_REF=$(cat opendaq_ref)" >> "$GITHUB_ENV" + + - uses: openDAQ/openDAQ-CI/.github/actions/staging-check@v3 + env: + CHANNEL: ${{ steps.channel.outputs.channel }} + with: + packages: >- + [ + { "path": "ghcr.io/openDAQ/$CHANNEL/staging/opendaq", "tag": "$CORE_REF" } + ] \ No newline at end of file diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml new file mode 100644 index 0000000..0dd0bf3 --- /dev/null +++ b/.github/workflows/cleanup.yml @@ -0,0 +1,24 @@ +name: Clean up stagings + +on: + schedule: + - cron: '0 6 * * 1' + workflow_dispatch: + inputs: + dry-run: + description: "List what would be pruned without deleting." + type: boolean + default: false + +jobs: + cleanup: + name: Stagings + permissions: + packages: write + uses: openDAQ/openDAQ-CI/.github/workflows/staging-cleanup.yml@v3 + with: + dry-run: ${{ inputs.dry-run || false }} + staging-retentions: >- + [ + { "path": "ghcr.io/openDAQ/dev/staging/mqtt-module", "retention": { "days": 30 } } + ] \ No newline at end of file diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml new file mode 100644 index 0000000..7a7463d --- /dev/null +++ b/.github/workflows/stage.yml @@ -0,0 +1,109 @@ +name: Build MQTT module stagings + +on: + schedule: + - cron: '0 2 * * 1' + workflow_dispatch: + + +jobs: + resolve: + name: Resolve the core commit + runs-on: ubuntu-latest + outputs: + core-ref: ${{ steps.core.outputs.ref }} + channel: ${{ steps.channel.outputs.channel }} + steps: + - uses: actions/checkout@v4 + + - uses: openDAQ/openDAQ-CI/.github/actions/resolve-channel@v3 + id: channel + + - name: Read the pinned core ref + id: core + shell: bash + run: echo "ref=$(cat opendaq_ref)" >> "$GITHUB_OUTPUT" + + stage: + needs: resolve + name: MQTTModulesModern + permissions: + contents: read + packages: write + uses: openDAQ/openDAQ-CI/.github/workflows/stage.yml@v3 + with: + timeout: '[{"timeout-minutes": 180}]' + staging-pull: >- + [ + { "artifact": "core-windows-2022-x86_64-msvs-v143-release", "packages": [{ "path": "ghcr.io/openDAQ/${{ needs.resolve.outputs.channel }}/staging/opendaq", "tag": "${{ needs.resolve.outputs.core-ref }}", "annotations": { "com.opendaq.custom.platform": "windows", "com.opendaq.settings.arch": "x86_64" } }] }, + { "artifact": "core-windows-2022-x86-msvs-v143-release", "packages": [{ "path": "ghcr.io/openDAQ/${{ needs.resolve.outputs.channel }}/staging/opendaq", "tag": "${{ needs.resolve.outputs.core-ref }}", "annotations": { "com.opendaq.custom.platform": "windows", "com.opendaq.settings.arch": "x86" } }] }, + { "artifact": "core-manylinux_2_28-x86_64-ninja-gcc-14-release", "packages": [{ "path": "ghcr.io/openDAQ/${{ needs.resolve.outputs.channel }}/staging/opendaq", "tag": "${{ needs.resolve.outputs.core-ref }}", "annotations": { "com.opendaq.custom.platform": "manylinux_2_28", "com.opendaq.settings.arch": "x86_64" } }] }, + { "artifact": "core-manylinux_2_28-armv8-ninja-gcc-14-release", "packages": [{ "path": "ghcr.io/openDAQ/${{ needs.resolve.outputs.channel }}/staging/opendaq", "tag": "${{ needs.resolve.outputs.core-ref }}", "annotations": { "com.opendaq.custom.platform": "manylinux_2_28", "com.opendaq.settings.arch": "armv8" } }] }, + { "artifact": "core-ubuntu-22.04-x86_64-ninja-gcc-release", "packages": [{ "path": "ghcr.io/openDAQ/${{ needs.resolve.outputs.channel }}/staging/opendaq", "tag": "${{ needs.resolve.outputs.core-ref }}", "annotations": { "com.opendaq.custom.platform": "linux", "com.opendaq.settings.arch": "x86_64" } }] }, + { "artifact": "core-ubuntu-22.04-armv8-ninja-gcc-release", "packages": [{ "path": "ghcr.io/openDAQ/${{ needs.resolve.outputs.channel }}/staging/opendaq", "tag": "${{ needs.resolve.outputs.core-ref }}", "annotations": { "com.opendaq.custom.platform": "linux", "com.opendaq.settings.arch": "armv8" } }] }, + { "artifact": "core-macos-26-x86_64-ninja-appleclang-21-release","packages": [{ "path": "ghcr.io/openDAQ/${{ needs.resolve.outputs.channel }}/staging/opendaq", "tag": "${{ needs.resolve.outputs.core-ref }}", "annotations": { "com.opendaq.custom.platform": "macos", "com.opendaq.settings.arch": "x86_64" } }] }, + { "artifact": "core-macos-26-armv8-ninja-appleclang-21-release", "packages": [{ "path": "ghcr.io/openDAQ/${{ needs.resolve.outputs.channel }}/staging/opendaq", "tag": "${{ needs.resolve.outputs.core-ref }}", "annotations": { "com.opendaq.custom.platform": "macos", "com.opendaq.settings.arch": "armv8" } }] } + ] + include-jobs: >- + [ + "windows-2022-x86_64-msvs-v143-release", + "windows-2022-x86-msvs-v143-release", + "manylinux_2_28-x86_64-ninja-gcc-14-release", + "manylinux_2_28-armv8-ninja-gcc-14-release", + "ubuntu-22.04-x86_64-ninja-gcc-release", + "ubuntu-22.04-armv8-ninja-gcc-release", + "macos-26-x86_64-ninja-appleclang-21-release", + "macos-26-armv8-ninja-appleclang-21-release" + ] + packages: >- + [ + { "match-jobs": ["windows-2022-x86_64-msvs-v143-release"], "artifacts": [{ "name": "core-windows-2022-x86_64-msvs-v143-release", "dir": "staging-deps" }] }, + { "match-jobs": ["windows-2022-x86-msvs-v143-release"], "artifacts": [{ "name": "core-windows-2022-x86-msvs-v143-release", "dir": "staging-deps" }] }, + { "match-jobs": ["manylinux_2_28-x86_64-ninja-gcc-14-release"], "artifacts": [{ "name": "core-manylinux_2_28-x86_64-ninja-gcc-14-release", "dir": "staging-deps" }] }, + { "match-jobs": ["manylinux_2_28-armv8-ninja-gcc-14-release"], "artifacts": [{ "name": "core-manylinux_2_28-armv8-ninja-gcc-14-release", "dir": "staging-deps" }] }, + { "match-jobs": ["ubuntu-22.04-x86_64-ninja-gcc-release"], "artifacts": [{ "name": "core-ubuntu-22.04-x86_64-ninja-gcc-release", "dir": "staging-deps" }] }, + { "match-jobs": ["ubuntu-22.04-armv8-ninja-gcc-release"], "artifacts": [{ "name": "core-ubuntu-22.04-armv8-ninja-gcc-release", "dir": "staging-deps" }] }, + { "match-jobs": ["macos-26-x86_64-ninja-appleclang-21-release"],"artifacts": [{ "name": "core-macos-26-x86_64-ninja-appleclang-21-release", "dir": "staging-deps" }] }, + { "match-jobs": ["macos-26-armv8-ninja-appleclang-21-release"], "artifacts": [{ "name": "core-macos-26-armv8-ninja-appleclang-21-release", "dir": "staging-deps" }] }, + { "match-jobs": ["ubuntu-*"], "apt-install": ["libssl-dev"] }, + { "match-jobs": ["manylinux*"], "yum-install": ["openssl-devel"] }, + { "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: >- + [ + { + "match-jobs": ["*"], + "configure-preset": "stage", + "cache-variables": + { + "CMAKE_PREFIX_PATH": "${sourceDir}/staging-deps;${sourceDir}/staging-deps/opt/opendaq" + } + }, + { + "match-jobs": ["macos-*-x86_64-*"], + "cache-variables": {"CMAKE_OSX_DEPLOYMENT_TARGET": "10.15"} + }, + { + "match-jobs": ["macos-*-armv8-*"], + "cache-variables": {"CMAKE_OSX_DEPLOYMENT_TARGET": "11.0"} + }, + { + "match-jobs": ["windows-*-x86-*"], + "cache-variables": {"OPENSSL_ROOT_DIR": "C:/vcpkg/installed/x86-windows"} + } + ] + cpack-presets: >- + [ + { + "match-jobs": ["*"], + "stagings": [{"name": "mqtt"}] + } + ] + staging-push: >- + [ + { + "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.channel }}/staging/mqtt-module", + "artifacts": ["staging-*/mqtt"], + "tags": ["latest"] + } + ] \ No newline at end of file diff --git a/cmake/Packing.cmake b/cmake/Packing.cmake new file mode 100644 index 0000000..edcf6ad --- /dev/null +++ b/cmake/Packing.cmake @@ -0,0 +1,53 @@ +## +## CPack configuration for the MQTT module +## + +set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) +set(CPACK_PACKAGE_VENDOR "openDAQ d.o.o.") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "openDAQ MQTT module") +set(CPACK_PACKAGE_HOMEPAGE_URL "https://opendaq.io/") +set(CPACK_PACKAGE_CONTACT "info@opendaq.io") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") + +set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) +set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) +set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH}) + +set(CPACK_VERBATIM_VARIABLES ON) +set(CPACK_THREADS 0) + +set(CPACK_GENERATOR TGZ) +set(CPACK_COMPONENTS_GROUPING ALL_COMPONENTS_IN_ONE) +set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) + +if(NOT CPACK_PACKAGE_DIRECTORY) + set(CPACK_PACKAGE_DIRECTORY "${CMAKE_SOURCE_DIR}/build/_packages") +endif() + +## +## Package filename and staging metadata +## +## Format: mqtt-module-[-]----- +## Composed by opendaq-cmake-utils, the same way core names its packages. +## + +set(CPACK_OPENDAQ_META_PACKAGE_NAME "mqtt-module") + +execute_process(COMMAND git -C "${CMAKE_CURRENT_SOURCE_DIR}" rev-parse --short=7 HEAD + OUTPUT_VARIABLE _PACKING_SHORT_SHA + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET +) +if(_PACKING_SHORT_SHA) + set(CPACK_OPENDAQ_META_PACKAGE_VERSION_SUFFIX "-${_PACKING_SHORT_SHA}") +endif() + +opendaq_detect_settings() +opendaq_detect_package() +opendaq_compose_package_triplet() +opendaq_compose_package_file_name() + +# Let each cpack run name the package it produces (-D CPACK_OPENDAQ_META_PACKAGE_NAME=...). +set(CPACK_PROJECT_CONFIG_FILE "${CPACK_OPENDAQ_PROJECT_CONFIG}") + +include(CPack) \ No newline at end of file From 7347d14971c7d7fb872cf99d7aec0b980ef1bd63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Tue, 22 Sep 2026 11:50:23 +0200 Subject: [PATCH 02/15] Updated the missing changes --- .github/workflows/ci-downstream.yml | 2 +- CMakeLists.txt | 7 +++++++ CMakePresets.json | 6 +++++- opendaq_ref | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-downstream.yml b/.github/workflows/ci-downstream.yml index a626205..7c40c23 100644 --- a/.github/workflows/ci-downstream.yml +++ b/.github/workflows/ci-downstream.yml @@ -12,7 +12,7 @@ on: jobs: call-opendaq-reusable: name: MQTT Streaming - uses: openDAQ/openDAQ-CI/.github/workflows/reusable.yml@v1 + uses: openDAQ/openDAQ-CI/.github/workflows/reusable.yml@v3 with: opendaq-ref: ${{ github.event.inputs.opendaq-ref || '' }} packages: > diff --git a/CMakeLists.txt b/CMakeLists.txt index 260662c..e49fa22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,9 @@ set(CMAKE_FOLDER "${CMAKE_FOLDER}/${REPO_NAME}") list(APPEND CMAKE_MESSAGE_CONTEXT ${REPO_NAME}) add_subdirectory(cmake) +# Names the install components of the modules: openDAQ__Runtime / _Development +set(SDK_NAME "${OPENDAQ_SDK_NAME}") + opendaq_read_file_contents("${CMAKE_CURRENT_LIST_DIR}/module_version" module_version) opendaq_get_version_major_minor_patch("${module_version}" ${REPO_OPTION_PREFIX}_VERSION) @@ -88,6 +91,10 @@ if (NOT TARGET "${OPENDAQ_SDK_TARGET_NAMESPACE}::${OPENDAQ_SDK_TARGET_NAME}") endif() endif() +if (PROJECT_IS_TOP_LEVEL) + include(cmake/Packing.cmake) +endif() + add_subdirectory(external) add_subdirectory(shared) add_subdirectory(modules) diff --git a/CMakePresets.json b/CMakePresets.json index 6bc5cf4..32f72f5 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -185,7 +185,11 @@ "cacheVariables": { "DAQMODULES_MQTT_ENABLE_TESTS": "ON" } - } + }, + { + "name": "stage", + "hidden": true, + "cacheVariables": {} ], "testPresets": [ { diff --git a/opendaq_ref b/opendaq_ref index 9f74233..5faa72a 100644 --- a/opendaq_ref +++ b/opendaq_ref @@ -1 +1 @@ -47593806ee16fbd5ea6b19f1f32309b583bb9a52 \ No newline at end of file +60e3fad4954f7ffee25a0a6c8f168af51704e4c2 \ No newline at end of file From ac136a564255a1b6ecccd7090f9950c803a3d681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 08:44:48 +0200 Subject: [PATCH 03/15] Update CMakePresets.json Updated small missing character --- CMakePresets.json | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakePresets.json b/CMakePresets.json index 32f72f5..fa683b9 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -190,6 +190,7 @@ "name": "stage", "hidden": true, "cacheVariables": {} + } ], "testPresets": [ { From 619fd64200e012efa1aaa4b0e27e3f87b4dd1b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 09:51:55 +0200 Subject: [PATCH 04/15] Small additional fixes # Conflicts: # CMakePresets.json --- .github/workflows/ci-downstream.yml | 13 +++++++++++++ .github/workflows/stage.yml | 3 +++ CMakePresets.json | 6 ++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-downstream.yml b/.github/workflows/ci-downstream.yml index 7c40c23..44836a6 100644 --- a/.github/workflows/ci-downstream.yml +++ b/.github/workflows/ci-downstream.yml @@ -15,6 +15,19 @@ jobs: uses: openDAQ/openDAQ-CI/.github/workflows/reusable.yml@v3 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-26-x86_64-ninja-appleclang-17-release", + "macos-26-x86_64-ninja-appleclang-17-debug", + "macos-26-armv8-ninja-appleclang-21-release" + ] packages: > [ { diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index 7a7463d..3960acb 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -1,6 +1,9 @@ name: Build MQTT module stagings on: + push: + branches: [other/CI-staging] + schedule: - cron: '0 2 * * 1' workflow_dispatch: diff --git a/CMakePresets.json b/CMakePresets.json index fa683b9..a25ec71 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -189,8 +189,10 @@ { "name": "stage", "hidden": true, - "cacheVariables": {} - } + "cacheVariables": { + "DAQMODULES_MQTT_ENABLE_EXAMPLE_APP": "false", + "DAQMODULES_MQTT_ENABLE_TESTS": "false" + } ], "testPresets": [ { From 336b1f8128f15d72f1522987bf987c1b20b04289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 09:54:57 +0200 Subject: [PATCH 05/15] Misslabeled variable states --- CMakePresets.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index a25ec71..35b987d 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -190,8 +190,8 @@ "name": "stage", "hidden": true, "cacheVariables": { - "DAQMODULES_MQTT_ENABLE_EXAMPLE_APP": "false", - "DAQMODULES_MQTT_ENABLE_TESTS": "false" + "DAQMODULES_MQTT_ENABLE_EXAMPLE_APP": "OFF", + "DAQMODULES_MQTT_ENABLE_TESTS": "OFF" } ], "testPresets": [ From eccf734d72342379ffde8ccad30da98026f092cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 11:11:07 +0200 Subject: [PATCH 06/15] Added missing cache variables --- CMakePresets.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 35b987d..ffb5745 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -190,8 +190,11 @@ "name": "stage", "hidden": true, "cacheVariables": { - "DAQMODULES_MQTT_ENABLE_EXAMPLE_APP": "OFF", - "DAQMODULES_MQTT_ENABLE_TESTS": "OFF" + "DAQMODULES_MQTT_ENABLE_EXAMPLE_APP": "false", + "DAQMODULES_MQTT_ENABLE_TESTS": "false", + "DAQMODULES_REF_DEVICE_MODULE": "false", + "DAQMODULES_REF_FB_MODULE": "false" + } ], "testPresets": [ From 45d57750d6e403cc4d9626f10fccfdfc581d6b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 11:16:15 +0200 Subject: [PATCH 07/15] xD --- CMakePresets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index ffb5745..adbcb40 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -194,8 +194,8 @@ "DAQMODULES_MQTT_ENABLE_TESTS": "false", "DAQMODULES_REF_DEVICE_MODULE": "false", "DAQMODULES_REF_FB_MODULE": "false" - } + } ], "testPresets": [ { From 4188118ccc1aa16adac12893b87cadc654cc8418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 11:29:54 +0200 Subject: [PATCH 08/15] Updated cmake and yaml --- .github/workflows/ci-downstream.yml | 1 + CMakePresets.json | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-downstream.yml b/.github/workflows/ci-downstream.yml index 44836a6..93aa1c5 100644 --- a/.github/workflows/ci-downstream.yml +++ b/.github/workflows/ci-downstream.yml @@ -48,6 +48,7 @@ jobs: cmake-presets: > [ { + "match-jobs": ["*"], "configure-preset": "module", "test-preset": "module-test" } diff --git a/CMakePresets.json b/CMakePresets.json index adbcb40..8e81995 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -190,10 +190,11 @@ "name": "stage", "hidden": true, "cacheVariables": { - "DAQMODULES_MQTT_ENABLE_EXAMPLE_APP": "false", - "DAQMODULES_MQTT_ENABLE_TESTS": "false", - "DAQMODULES_REF_DEVICE_MODULE": "false", - "DAQMODULES_REF_FB_MODULE": "false" + "DAQMODULES_MQTT_ENABLE_TESTS": false, + "DAQMODULES_MQTT_ENABLE_EXAMPLE_APP": false, + "DAQMODULES_REF_DEVICE_MODULE": false, + "DAQMODULES_REF_FB_MODULE": false, + } } ], From 19e6978ae7b4d3afcac5a385a840ed30aa83d3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 11:55:49 +0200 Subject: [PATCH 09/15] Removed the trailing comma and changed the staging push trigger --- .github/workflows/stage.yml | 2 +- CMakePresets.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index 3960acb..51e8cb8 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -2,7 +2,7 @@ name: Build MQTT module stagings on: push: - branches: [other/CI-staging] + branches: [CI-staging] schedule: - cron: '0 2 * * 1' diff --git a/CMakePresets.json b/CMakePresets.json index 8e81995..5c9a152 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -193,7 +193,7 @@ "DAQMODULES_MQTT_ENABLE_TESTS": false, "DAQMODULES_MQTT_ENABLE_EXAMPLE_APP": false, "DAQMODULES_REF_DEVICE_MODULE": false, - "DAQMODULES_REF_FB_MODULE": false, + "DAQMODULES_REF_FB_MODULE": false } } From 96b20066b79548868819080d79d7b7285e38d7de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 12:35:58 +0200 Subject: [PATCH 10/15] Maybe.... --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f140a48..04ee2c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,7 +127,7 @@ jobs: - name: Configure project with CMake working-directory: module - run: cmake -B build/output -S . -G "${{ matrix.generator }}" -DDAQMODULES_MQTT_ENABLE_TESTS=ON -DDAQMODULES_MQTT_DEBUG_WARNINGS_AS_ERRORS=ON -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" -DopenDAQ_DIR="${{ env.INSTALL_PREFIX }}/lib/cmake/opendaq/" + run: cmake -B build/output -S . -G "${{ matrix.generator }}" -DDAQMODULES_MQTT_ENABLE_TESTS=OFF -DDAQMODULES_MQTT_DEBUG_WARNINGS_AS_ERRORS=ON -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" -DopenDAQ_DIR="${{ env.INSTALL_PREFIX }}/lib/cmake/opendaq/" - name: Build project with CMake working-directory: module From e72e69f0a64754b5edf2cbf12f88091351ecbb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 13:13:46 +0200 Subject: [PATCH 11/15] hmm.... --- CMakePresets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index 5c9a152..dbbe2e4 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -183,7 +183,7 @@ "name": "module", "hidden": true, "cacheVariables": { - "DAQMODULES_MQTT_ENABLE_TESTS": "ON" + "DAQMODULES_MQTT_ENABLE_TESTS": "OFF" } }, { From ef188b70bef52b0639d54eb3651a734f5a3edf50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 14:46:55 +0200 Subject: [PATCH 12/15] Updated the lincence stuff --- cmake/Packing.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/Packing.cmake b/cmake/Packing.cmake index edcf6ad..a3f11cc 100644 --- a/cmake/Packing.cmake +++ b/cmake/Packing.cmake @@ -24,6 +24,10 @@ if(NOT CPACK_PACKAGE_DIRECTORY) set(CPACK_PACKAGE_DIRECTORY "${CMAKE_SOURCE_DIR}/build/_packages") endif() +if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") + set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") +endif() + ## ## Package filename and staging metadata ## From 214cf3cb16dcb95bedb88788727c659d41e4bb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 15:17:40 +0200 Subject: [PATCH 13/15] Reverted redundant flag flips --- .github/workflows/ci.yml | 2 +- CMakePresets.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04ee2c1..f140a48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,7 +127,7 @@ jobs: - name: Configure project with CMake working-directory: module - run: cmake -B build/output -S . -G "${{ matrix.generator }}" -DDAQMODULES_MQTT_ENABLE_TESTS=OFF -DDAQMODULES_MQTT_DEBUG_WARNINGS_AS_ERRORS=ON -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" -DopenDAQ_DIR="${{ env.INSTALL_PREFIX }}/lib/cmake/opendaq/" + run: cmake -B build/output -S . -G "${{ matrix.generator }}" -DDAQMODULES_MQTT_ENABLE_TESTS=ON -DDAQMODULES_MQTT_DEBUG_WARNINGS_AS_ERRORS=ON -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" -DopenDAQ_DIR="${{ env.INSTALL_PREFIX }}/lib/cmake/opendaq/" - name: Build project with CMake working-directory: module diff --git a/CMakePresets.json b/CMakePresets.json index dbbe2e4..5c9a152 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -183,7 +183,7 @@ "name": "module", "hidden": true, "cacheVariables": { - "DAQMODULES_MQTT_ENABLE_TESTS": "OFF" + "DAQMODULES_MQTT_ENABLE_TESTS": "ON" } }, { From 69c001e929bcfd70dff1aa9e66e2e59b9de0d057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 15:42:06 +0200 Subject: [PATCH 14/15] Changed a hard set to a conditional --- cmake/Packing.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Packing.cmake b/cmake/Packing.cmake index a3f11cc..7057df7 100644 --- a/cmake/Packing.cmake +++ b/cmake/Packing.cmake @@ -7,7 +7,7 @@ set(CPACK_PACKAGE_VENDOR "openDAQ d.o.o.") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "openDAQ MQTT module") set(CPACK_PACKAGE_HOMEPAGE_URL "https://opendaq.io/") set(CPACK_PACKAGE_CONTACT "info@opendaq.io") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") +## set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR}) From 99d67d88888d5f9041a9a9b24d3de2ded9d846bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Fri, 25 Sep 2026 16:19:55 +0200 Subject: [PATCH 15/15] Changed the sequence of imports --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e49fa22..630e3bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,14 +91,14 @@ if (NOT TARGET "${OPENDAQ_SDK_TARGET_NAMESPACE}::${OPENDAQ_SDK_TARGET_NAME}") endif() endif() -if (PROJECT_IS_TOP_LEVEL) - include(cmake/Packing.cmake) -endif() - add_subdirectory(external) add_subdirectory(shared) add_subdirectory(modules) +if (PROJECT_IS_TOP_LEVEL) + include(cmake/Packing.cmake) +endif() + if(${REPO_OPTION_PREFIX}_ENABLE_EXAMPLE_APP) message(STATUS "Example applications in ${REPO_NAME} are ENABLED") add_subdirectory(examples)