PR comments

Author: legleux

.github/actions/generate/action.yml

@@ -38,7 +38,7 @@ inputs:
     required: true
     default: "false"
   package:
-    description: Whether to generate Linux binary packages
+    description: Whether to generate Debian package
     required: true
     default: "false"
 

.github/workflows/build_and_test.yml

@@ -64,7 +64,7 @@ on:
         default: ""
 
       package:
-        description: Build Linux deb package
+        description: Whether to generate Debian package
         required: false
         type: boolean
         default: true

.github/workflows/build_impl.yml

@@ -60,7 +60,7 @@ on:
         default: ""
 
       package:
-        description: Build Linux deb package
+        description: Whether to generate Debian package
         required: false
         type: boolean
 
@@ -164,14 +164,14 @@ jobs:
           path: build/clio_server
 
       - name: Upload clio_tests
-        if: ${{ !inputs.code_coverage && !inputs.analyze_build_time }}
+        if: ${{ !inputs.code_coverage && !inputs.analyze_build_time && !inputs.package }}
         uses: actions/upload-artifact@v4
         with:
           name: clio_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
           path: build/clio_tests
 
       - name: Upload clio_integration_tests
-        if: ${{ !inputs.code_coverage && !inputs.analyze_build_time }}
+        if: ${{ !inputs.code_coverage && !inputs.analyze_build_time && !inputs.package }}
         uses: actions/upload-artifact@v4
         with:
           name: clio_integration_tests_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
@@ -181,7 +181,7 @@ jobs:
         if: inputs.package
         uses: actions/upload-artifact@v4
         with:
-          name: Clio_debian_package
+          name: clio_deb_package_${{ runner.os }}_${{ inputs.build_type }}_${{ inputs.conan_profile }}
           path: build/*.deb
 
       - name: Save cache

cmake/ClioPackage.cmake

@@ -1,40 +1,7 @@
-set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/clio")
 include("${CMAKE_CURRENT_LIST_DIR}/ClioVersion.cmake")
 
-set(VERSION ${CLIO_VERSION})
-
-if (VERSION MATCHES "^([0-9]+)\.([0-9]+)\.([0-9]+)(-(b|rc|hf)([0-9]+))?$|^([0-9a-zA-Z]+)-(.+)-([0-9a-fA-F]+)$")
-  if (CMAKE_MATCH_2)
-    set(MAJOR "${CMAKE_MATCH_1}")
-    set(MINOR "${CMAKE_MATCH_2}")
-    set(PATCH "${CMAKE_MATCH_3}")
-    message(DEBUG " Major: ${MAJOR}")
-    message(DEBUG " Minor: ${MINOR}")
-    message(DEBUG " Patch: ${PATCH}")
-    set(release_type "release ${MAJOR}.${MINOR}.${PATCH}")
-    if (CMAKE_MATCH_4)
-      set(PRE_TYPE "${CMAKE_MATCH_5}")
-      set(PRE_NUM "${CMAKE_MATCH_6}")
-      message(DEBUG " Pre-release type: ${PRE_TYPE}")
-      message(DEBUG " Pre-release number number: ${PRE_NUM}")
-      set(release_type "pre-${release_type}-${PRE_TYPE}-${PRE_NUM}")
-    endif ()
-  else ()
-    set(DATE "${CMAKE_MATCH_7}")
-    set(BRANCH "${CMAKE_MATCH_8}")
-    set(GIT_HASH "${CMAKE_MATCH_9}")
-    message(DEBUG " Date: ${DATE}")
-    message(DEBUG " Branch: ${BRANCH}")
-    message(DEBUG " Git hash: ${GIT_HASH}")
-    set(release_type "development ${DATE}-${BRANCH}-${GIT_HASH}")
-  endif ()
-  set(CPACK_PACKAGE_VERSION "${CMAKE_MATCH_0}")
-else ()
-  message(FATAL_ERROR "Version string '${CLIO_VERSION}' did not match expected patterns.")
-endif ()
-
-message(STATUS "Release type: ${release_type}")
-
+set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/clio")
+set(CPACK_PACKAGE_VERSION "${CLIO_VERSION}")
 set(CPACK_STRIP_FILES TRUE)
 
 include(pkg/deb)

cmake/pkg/postinst

@@ -12,7 +12,7 @@ case "$1" in
     configure)
         if ! id -u "$USER_NAME" >/dev/null 2>&1; then
             adduser --system --quiet \
-                --home /nonexistent --no-create-home \
+                --no-create-home \
                 --disabled-password \
                 --group "$GROUP_NAME"
         fi