From 8d24e3246305b8250c91eab8e243cbbacc533485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Tue, 22 Sep 2026 10:56:45 +0200 Subject: [PATCH 1/6] Publish ASAM CMP module stagings --- .github/workflows/check-core-staging.yml | 35 ++++++++ .github/workflows/cleanup.yml | 24 +++++ .github/workflows/stage.yml | 109 +++++++++++++++++++++++ cmake/Packing.cmake | 53 +++++++++++ opendaq_ref | 2 +- 5 files changed, 222 insertions(+), 1 deletion(-) 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..e642c9a --- /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..8f595df --- /dev/null +++ b/.github/workflows/cleanup.yml @@ -0,0 +1,24 @@ +name: Clean up stagings + +on: + schedule: + - cron: '06**1' + workflow_dispatch: + inputs: + dry-run: + description: "List what would be pruned without deleting." + type: boolean + default: false + +jobs: + cleanup: + name: Stagings + permissions: + package: 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/asam-cmp-modules", "retentions": {"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..e201d41 --- /dev/null +++ b/.github/workflows/stage.yml @@ -0,0 +1,109 @@ +name: Build ASAM CMP module stagings + +on: + schedule: + - cron: '02**1' + workflow_dispatch: + + +jobs: + resolve: + name: Resolv 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: ASAM-CMP-Module + permissions: + contests: 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"} + } + ] + cmake-presets: >- + [ + { + "match-jobs": ["*"], + "stagings": [{"name": "asam-cmp"}] + } + ] + staging-push: >- + [ + { + "path": "ghcr.io/${{ github.repository_owner }}/${{ needs.resolve.outputs.channel }}/staging/asam-cmp-modules", + "artifacts": ["staging-*/asam-cmp"], + "tags": ["latest"] + } + ] \ No newline at end of file diff --git a/cmake/Packing.cmake b/cmake/Packing.cmake new file mode 100644 index 0000000..2e0cf52 --- /dev/null +++ b/cmake/Packing.cmake @@ -0,0 +1,53 @@ +## +## CPack configuration for the ASAM CMP module +## + +set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) +set(CPACK_PACKAGE_VENDOR "openDAQ d.o.o.") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "openDAQ ASAM CMP 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: asam-cmp-module-[-]----- +## Composed by opendaq-cmake-utils, the same way core names its packages. +## + +set(CPACK_OPENDAQ_META_PACKAGE_NAME "asam-cmp-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 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 512fe86de708c839e22e8c2668044b43b121de91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Tue, 22 Sep 2026 11:55:17 +0200 Subject: [PATCH 2/6] Updated the missing staging changes --- .github/workflows/ci-downstream.yml | 2 +- CMakeLists.txt | 7 +++++++ CMakePresets.json | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-downstream.yml b/.github/workflows/ci-downstream.yml index faae53e..525211e 100644 --- a/.github/workflows/ci-downstream.yml +++ b/.github/workflows/ci-downstream.yml @@ -12,7 +12,7 @@ on: jobs: call-opendaq-reusable: name: ASAM CMP - 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 653a4ec..2f1f770 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,9 @@ set(REPO_OPTION_PREFIX ASAM_CMP) 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) @@ -84,6 +87,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 6df8dd7..1f41063 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -6,6 +6,11 @@ "cacheVariables": { "ASAM_CMP_ENABLE_EXAMPLE": false } + }, + { + "name": "stage", + "hidden": true, + "cacheVariables":{} } ], "testPresets": [ From ce964d7b19600da2bf9788de6acb19ced535cfd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Tue, 22 Sep 2026 12:54:24 +0200 Subject: [PATCH 3/6] Updated CMake --- CMakePresets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index 1f41063..5d29179 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -10,7 +10,7 @@ { "name": "stage", "hidden": true, - "cacheVariables":{} + "cacheVariables": {} } ], "testPresets": [ From 5c327200c3220d0a6192f143be13faca0e9bc64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Wed, 23 Sep 2026 11:08:56 +0200 Subject: [PATCH 4/6] Addressed the code review --- .github/workflows/check-core-staging.yml | 8 ++++---- .github/workflows/ci-downstream.yml | 13 +++++++++++++ .github/workflows/cleanup.yml | 4 ++-- .github/workflows/stage.yml | 17 ++++++++--------- CMakeLists.txt | 3 --- CMakePresets.json | 6 +++++- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/.github/workflows/check-core-staging.yml b/.github/workflows/check-core-staging.yml index e642c9a..b193ec0 100644 --- a/.github/workflows/check-core-staging.yml +++ b/.github/workflows/check-core-staging.yml @@ -19,16 +19,16 @@ jobs: - uses: actions/checkout@v4 - uses: openDAQ/openDAQ-CI/.github/actions/resolve-channel@v3 - id: channel + id: channel - name: Read the pinned core ref - shell: bash + shell: bash run: echo "CORE_REF=$(cat opendaq_ref)" >> "$GITHUB_ENV" - uses: openDAQ/openDAQ-CI/.github/actions/staging-check@v3 - env: + env: CHANNEL: ${{steps.channel.outputs.channel}} - with: + with: packages: >- [ {"path": "ghcr.io/openDAQ/$CHANNEL/staging/opendaq", "tag": "$CORE_REF"} diff --git a/.github/workflows/ci-downstream.yml b/.github/workflows/ci-downstream.yml index 525211e..4d0b41b 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/cleanup.yml b/.github/workflows/cleanup.yml index 8f595df..c890eb3 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -2,7 +2,7 @@ name: Clean up stagings on: schedule: - - cron: '06**1' + - cron: '0 6 * * 1' workflow_dispatch: inputs: dry-run: @@ -14,7 +14,7 @@ jobs: cleanup: name: Stagings permissions: - package: write + packages: write uses: openDAQ/openDAQ-CI/.github/workflows/staging-cleanup.yml@v3 with: dry-run: ${{inputs.dry-run || false}} diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index e201d41..d84f521 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -1,8 +1,11 @@ name: Build ASAM CMP module stagings on: + push: + branches: [other/CIstaging] + schedule: - - cron: '02**1' + - cron: '0 2 * * 1' workflow_dispatch: @@ -28,7 +31,7 @@ jobs: needs: resolve name: ASAM-CMP-Module permissions: - contests: read + contents: read packages: write uses: openDAQ/openDAQ-CI/.github/workflows/stage.yml@v3 with: @@ -65,8 +68,8 @@ jobs: { "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": ["ubuntu-*"], "apt-install": ["libpcap-dev"] }, + { "match-jobs": ["manylinux*"], "yum-install": ["libpcap-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: >- @@ -86,13 +89,9 @@ jobs: { "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"} } ] - cmake-presets: >- + cpack-presets: >- [ { "match-jobs": ["*"], diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f1f770..8b092ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,6 +114,3 @@ elseif (UNIX AND NOT APPLE) set(CPACK_SYSTEM_NAME "${DISTRO_ID}${DISTRO_VERSION_ID}") set(CPACK_GENERATOR "TGZ") endif() - -# Include CPack for packaging -include(CPack) diff --git a/CMakePresets.json b/CMakePresets.json index 5d29179..30e5764 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -10,7 +10,11 @@ { "name": "stage", "hidden": true, - "cacheVariables": {} + "cacheVariables": { + "ASAM_CMP_ENABLE_TESTS": "OFF", + "ASAM_CMP_ENALBE_EXAMPLE": "OFF", + "CPACK_COMPONENETS_ALL": "openDAQ_asam_cmp_capture_module_Runtime;openDAQ_asam_cmp_data_sink_Runtime" + } } ], "testPresets": [ From 425b5e135e45433fecae0cc32973953e32d3040d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Wed, 23 Sep 2026 16:04:05 +0200 Subject: [PATCH 5/6] Addressed code review --- .github/workflows/check-core-staging.yml | 2 +- .github/workflows/stage.yml | 2 +- CMakePresets.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-core-staging.yml b/.github/workflows/check-core-staging.yml index b193ec0..36415c0 100644 --- a/.github/workflows/check-core-staging.yml +++ b/.github/workflows/check-core-staging.yml @@ -23,7 +23,7 @@ jobs: - name: Read the pinned core ref shell: bash - run: echo "CORE_REF=$(cat opendaq_ref)" >> "$GITHUB_ENV" + run: echo "CORE_REF=$(cat opendaq_ref)" >> "$GITHUB_ENV" - uses: openDAQ/openDAQ-CI/.github/actions/staging-check@v3 env: diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index d84f521..464ac95 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -2,7 +2,7 @@ name: Build ASAM CMP module stagings on: push: - branches: [other/CIstaging] + branches: [other/CIstagings] schedule: - cron: '0 2 * * 1' diff --git a/CMakePresets.json b/CMakePresets.json index 30e5764..0857d99 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -12,8 +12,8 @@ "hidden": true, "cacheVariables": { "ASAM_CMP_ENABLE_TESTS": "OFF", - "ASAM_CMP_ENALBE_EXAMPLE": "OFF", - "CPACK_COMPONENETS_ALL": "openDAQ_asam_cmp_capture_module_Runtime;openDAQ_asam_cmp_data_sink_Runtime" + "ASAM_CMP_ENABLE_EXAMPLE": "OFF", + "CPACK_COMPONENTS_ALL": "openDAQ_asam_cmp_capture_module_Runtime;openDAQ_asam_cmp_data_sink_Runtime" } } ], From 0752d5e82daa9809e988c83b147eea08a5d91d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE=20Zako=C5=A1ek?= Date: Thu, 24 Sep 2026 14:52:04 +0200 Subject: [PATCH 6/6] Minor naming change and removal of testing procuderes --- .github/workflows/stage.yml | 3 --- cmake/Packing.cmake | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index 464ac95..294b424 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -1,9 +1,6 @@ name: Build ASAM CMP module stagings on: - push: - branches: [other/CIstagings] - schedule: - cron: '0 2 * * 1' workflow_dispatch: diff --git a/cmake/Packing.cmake b/cmake/Packing.cmake index 2e0cf52..d43c7e8 100644 --- a/cmake/Packing.cmake +++ b/cmake/Packing.cmake @@ -31,7 +31,7 @@ endif() ## Composed by opendaq-cmake-utils, the same way core names its packages. ## -set(CPACK_OPENDAQ_META_PACKAGE_NAME "asam-cmp-module") +set(CPACK_OPENDAQ_META_PACKAGE_NAME "asam-cmp-modules") execute_process(COMMAND git -C "${CMAKE_CURRENT_SOURCE_DIR}" rev-parse --short=7 HEAD OUTPUT_VARIABLE _PACKING_SHORT_SHA