Add cmake-preset-name option

Author: Aliaksandr Adziareika

.github/actions/build-sdk/action.yml

@@ -10,8 +10,12 @@ inputs:
     description: 'Path for build directory (defaults to "{source-path}/build")'
     required: false
     default: ''
-  cmake-generator:
-    description: 'CMake generator to use'
+  cmake-generator-name:
+    description: 'CMake generator name (e.g., "Ninja", "Visual Studio 17 2022")'
+    required: false
+    default: ''
+  cmake-preset-name:
+    description: 'CMake preset name (e.g., "package", "ci")'
     required: false
     default: ''
   cmake-config:
@@ -42,8 +46,8 @@ inputs:
     description: 'Run tests after build'
     required: false
     default: 'false'
-  cpack-generator:
-    description: 'CPack package generator (e.g., "DEB", "RPM", "NSIS", "TGZ", "ZIP")'
+  cpack-generator-name:
+    description: 'CPack generator name (e.g., "DEB", "RPM", "NSIS", "TGZ", "ZIP")'
     required: false
     default: ''
 
@@ -77,10 +81,11 @@ runs:
         echo "build-path=$BUILD_PATH" >> "$GITHUB_OUTPUT"
 
         # Set default cmake-generator
-        CMAKE_GENERATOR="${{ inputs.cmake-generator }}"
-        if [ -z "$CMAKE_GENERATOR" ]; then
-          CMAKE_GENERATOR="Ninja"
+        CMAKE_GENERATOR_NAME="${{ inputs.cmake-generator-name }}"
+        if [ -z "$CMAKE_GENERATOR_NAME" ]; then
+          CMAKE_GENERATOR_NAME="Ninja"
         fi
+        CMAKE_GENERATOR="-G \"$CMAKE_GENERATOR_NAME\""
         echo "cmake-generator=$CMAKE_GENERATOR" >> "$GITHUB_OUTPUT"
 
         # Set default cmake-config
@@ -97,6 +102,15 @@ runs:
         fi
         echo "ccache-path=$CCACHE_PATH" >> "$GITHUB_OUTPUT"
 
+        # Set cmake-preset (as --preset flag or empty string)
+        CMAKE_PRESET_NAME="${{ inputs.cmake-preset-name }}"
+        if [ -z "$CMAKE_PRESET_NAME" ]; then
+          CMAKE_PRESET=""
+        else
+          CMAKE_PRESET="--preset $CMAKE_PRESET_NAME"
+        fi
+        echo "cmake-preset=$CMAKE_PRESET" >> "$GITHUB_OUTPUT"
+
     - name: Normalize paths
       id: normalize
       shell: bash
@@ -113,6 +127,10 @@ runs:
         if command -v cygpath &> /dev/null; then
           BUILD_PATH=$(cygpath -u "$BUILD_PATH")
         fi
+
+        # Create build directory if it doesn't exist
+        mkdir -p "$BUILD_PATH"
+
         echo "build-path=$BUILD_PATH" >> "$GITHUB_OUTPUT"
 
     - name: Read version and commit hash
@@ -175,16 +193,25 @@ runs:
     - name: Configure CMake
       shell: bash
       run: |
+        # Get absolute paths
+        SOURCE_DIR="$(cd "${{ steps.normalize.outputs.source-path }}" && pwd)"
+        BUILD_DIR="$(cd "${{ steps.normalize.outputs.build-path }}" && pwd)"
+
         echo "CMake Configuration:"
-        echo "  Source: ${{ steps.normalize.outputs.source-path }}"
-        echo "  Build: ${{ steps.normalize.outputs.build-path }}"
+        echo "  Source: $SOURCE_DIR"
+        echo "  Build: $BUILD_DIR"
         echo "  Generator: ${{ steps.defaults.outputs.cmake-generator }}"
+        echo "  Preset: ${{ steps.defaults.outputs.cmake-preset }}"
         echo "  Config: ${{ steps.defaults.outputs.cmake-config }}"
         echo ""
+
+        # Run cmake from inside build directory
+        cd "$BUILD_DIR"
+
         echo "::group::CMake Configuration Output"
-        cmake -S "${{ steps.normalize.outputs.source-path }}" \
-          -B "${{ steps.normalize.outputs.build-path }}" \
-          -G "${{ steps.defaults.outputs.cmake-generator }}" \
+        cmake "$SOURCE_DIR" \
+          ${{ steps.defaults.outputs.cmake-generator }} \
+          ${{ steps.defaults.outputs.cmake-preset }} \
           -DCMAKE_BUILD_TYPE=${{ steps.defaults.outputs.cmake-config }} \
           ${{ inputs.cmake-compiler }} \
           ${{ inputs.cmake-defines }}
@@ -216,14 +243,14 @@ runs:
         echo "✓ Tests passed successfully"
 
     - name: Package
-      if: inputs.cpack-generator != ''
+      if: inputs.cpack-generator-name != ''
       shell: bash
       run: |
         echo "CPack Packaging:"
-        echo "  Generator: ${{ inputs.cpack-generator }}"
+        echo "  Generator: ${{ inputs.cpack-generator-name }}"
         echo ""
         echo "::group::CPack Output"
-        cpack --config "${{ steps.normalize.outputs.build-path }}/CPackConfig.cmake" -G ${{ inputs.cpack-generator }}
+        cpack --config "${{ steps.normalize.outputs.build-path }}/CPackConfig.cmake" -G ${{ inputs.cpack-generator-name }}
         echo "::endgroup::"
         echo "✓ Package created successfully"
 

.github/actions/setup-dependencies/action.yml

@@ -32,7 +32,7 @@ runs:
       shell: pwsh
       run: |
         Write-Host "::group::Installing Windows dependencies"
-        choco install ccache ninja nsis vswhere -y
+        choco install ccache ninja nsis vswhere dotnet-sdk -y
         Write-Host "::endgroup::"
         Write-Host "✓ Windows dependencies installed"
 

.github/workflows/reusable-build-sdk.yml

@@ -18,11 +18,16 @@ on:
         required: false
         type: string
         default: 'windows-latest'
-      cmake-generator:
-        description: 'CMake generator to use'
+      cmake-generator-name:
+        description: 'CMake generator name (e.g., "Ninja", "Visual Studio 17 2022")'
         required: false
         type: string
         default: 'Ninja'
+      cmake-preset-name:
+        description: 'CMake preset name (e.g., "package", "ci")'
+        required: false
+        type: string
+        default: ''
       cmake-compiler:
         description: 'CMake compiler configuration'
         required: false
@@ -38,8 +43,8 @@ on:
         required: false
         type: boolean
         default: false
-      cpack-generator:
-        description: 'CPack generator'
+      cpack-generator-name:
+        description: 'CPack generator name (e.g., "DEB", "RPM", "NSIS", "TGZ", "ZIP")'
         required: false
         type: string
         default: ''
@@ -101,22 +106,23 @@ jobs:
         uses: ./.github/actions/build-sdk
         with:
           source-path: ${{ steps.defaults.outputs.path }}
-          cmake-generator: ${{ inputs.cmake-generator }}
+          cmake-generator-name: ${{ inputs.cmake-generator-name }}
+          cmake-preset-name: ${{ inputs.cmake-preset-name }}
           cmake-compiler: ${{ inputs.cmake-compiler }}
           cmake-defines: ${{ steps.defaults.outputs.cmake-defines }}
           ccache-enable: ${{ inputs.ccache-enable }}
-          cpack-generator: ${{ inputs.cpack-generator }}
+          cpack-generator-name: ${{ inputs.cpack-generator-name }}
 
       - name: Compose openDAQ framework filename
-        if: inputs.cpack-generator != ''
+        if: inputs.cpack-generator-name != ''
         id: opendaq-filename
-        uses: openDAQ/actions/framework-compose-filename@jira/TBBAS-2680-opendaq-gh-actions-github-api-wrapper-unit-tests
+        uses: openDAQ/actions/framework-compose-filename@jira/TBBAS-2672-opendaq-gh-actions-architecture
         with:
           version: ${{ steps.build.outputs.version }}-${{ steps.build.outputs.commit-hash }}
-          packaging: ${{ inputs.cpack-generator }}
+          packaging: ${{ inputs.cpack-generator-name }}
 
       - name: Prepare artifact
-        if: inputs.cpack-generator != ''
+        if: inputs.cpack-generator-name != ''
         shell: bash
         env:
           ARTIFACT_FILENAME: ${{ steps.opendaq-filename.outputs.filename }}
@@ -152,7 +158,7 @@ jobs:
           fi
 
       - name: Upload artifact
-        if: inputs.cpack-generator != ''
+        if: inputs.cpack-generator-name != ''
         uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.opendaq-filename.outputs.filename }}

.github/workflows/test-reusable-build-sdk.yml

@@ -11,19 +11,20 @@ jobs:
       matrix:
         include:
           - runner: windows-latest
-            cmake-generator: Ninja
+            cmake-generator-name: Ninja
             cmake-compiler: >-
               -DCMAKE_C_COMPILER=cl
               -DCMAKE_CXX_COMPILER=cl
               -DCMAKE_C_COMPILER_LAUNCHER=ccache
               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-            cpack-generator: NSIS
+            cpack-generator-name: NSIS
 
     uses: ./.github/workflows/reusable-build-sdk.yml
     with:
       runner: ${{ matrix.runner }}
       path: openDAQ
-      cmake-generator: ${{ matrix.cmake-generator }}
+      cmake-generator-name: ${{ matrix.cmake-generator-name }}
+      cmake-preset-name: package
       cmake-compiler: ${{ matrix.cmake-compiler }}
       ccache-enable: true
-      cpack-generator: ${{ matrix.cpack-generator }}
+      cpack-generator-name: ${{ matrix.cpack-generator-name }}