S3rj1k

.github/workflows/build.yml

@@ -17,7 +17,7 @@ concurrency:
 jobs:
   build_rpm:
     name: 'Build RPM'
-    uses: signalwire/actions-template/.github/workflows/ci-rpm-packages.yml@main
+    uses: s3rj1k/actions-template/.github/workflows/ci-rpm-packages.yml@prebuild_script
     with:
       PROJECT_NAME: libks
       RUNNER: ubuntu-latest
@@ -29,7 +29,7 @@ jobs:
 
   build_deb:
     name: 'Build DEB'
-    uses: signalwire/actions-template/.github/workflows/ci-deb-packages-v2.yml@main
+    uses: s3rj1k/actions-template/.github/workflows/ci-deb-packages-v2.yml@prebuild_script
     strategy:
       fail-fast: false
       matrix:
@@ -60,7 +60,7 @@ jobs:
           - rpm
         platform:
           - amd64
-    uses: signalwire/actions-template/.github/workflows/ci-libs-metadata-v2.yml@main
+    uses: s3rj1k/actions-template/.github/workflows/ci-libs-metadata-v2.yml@prebuild_script
     with:
       ARTIFACT_NAME: ${{ matrix.os }}-${{ matrix.platform }}-artifact
       OS_PLATFORM: ${{ matrix.os }}-${{ matrix.platform }}
@@ -83,7 +83,7 @@ jobs:
         platform:
           - amd64
           - armhf
-    uses: signalwire/actions-template/.github/workflows/ci-libs-metadata-v2.yml@main
+    uses: s3rj1k/actions-template/.github/workflows/ci-libs-metadata-v2.yml@prebuild_script
     with:
       ARTIFACT_NAME: ${{ matrix.os }}-${{ matrix.codename }}-${{ matrix.platform }}-artifact
       OS_PLATFORM: ${{ matrix.os }}-${{ matrix.codename }}-${{ matrix.platform }}
@@ -101,7 +101,7 @@ jobs:
           - rpm
         platform:
           - amd64
-    uses: signalwire/actions-template/.github/workflows/cd-scp.yml@main
+    uses: s3rj1k/actions-template/.github/workflows/cd-scp.yml@prebuild_script
     with:
       ARTIFACT_NAME: ${{ matrix.os }}-${{ matrix.platform }}-artifact
       TARGET_FOLDER: /var/www/libks-${{ github.ref_name }}-${{ matrix.os }}-${{ matrix.platform }}/${{ github.run_id }}-${{ github.run_number }}
@@ -132,7 +132,7 @@ jobs:
         platform:
           - amd64
           - armhf
-    uses: signalwire/actions-template/.github/workflows/cd-scp.yml@main
+    uses: s3rj1k/actions-template/.github/workflows/cd-scp.yml@prebuild_script
     with:
       ARTIFACT_NAME: ${{ matrix.os }}-${{ matrix.codename }}-${{ matrix.platform }}-artifact
       TARGET_FOLDER: /var/www/libks-${{ github.ref_name }}-${{ matrix.os }}-${{ matrix.platform }}/${{ github.run_id }}-${{ github.run_number }}
@@ -158,7 +158,7 @@ jobs:
           - rpm
         platform:
           - amd64
-    uses: signalwire/actions-template/.github/workflows/cd-libs-metadata.yml@main
+    uses: s3rj1k/actions-template/.github/workflows/cd-libs-metadata.yml@prebuild_script
     with:
       ARTIFACT_NAME: ${{ matrix.os }}-${{ matrix.platform }}-meta
       LIB_NAME: libks
@@ -191,7 +191,7 @@ jobs:
         platform:
           - amd64
           - armhf
-    uses: signalwire/actions-template/.github/workflows/cd-libs-metadata.yml@main
+    uses: s3rj1k/actions-template/.github/workflows/cd-libs-metadata.yml@prebuild_script
     with:
       ARTIFACT_NAME: ${{ matrix.os }}-${{ matrix.codename }}-${{ matrix.platform }}-meta
       LIB_NAME: libks
@@ -211,7 +211,7 @@ jobs:
     permissions: write-all
     name: 'Copy hash to remote RPM'
     needs: [ distribute_meta_rpm ]
-    uses: signalwire/actions-template/.github/workflows/cd-scp.yml@main
+    uses: s3rj1k/actions-template/.github/workflows/cd-scp.yml@prebuild_script
     strategy:
       matrix:
         os:
@@ -233,7 +233,7 @@ jobs:
     permissions: write-all
     name: 'Copy hash to remote DEB'
     needs: [ distribute_meta_deb ]
-    uses: signalwire/actions-template/.github/workflows/cd-scp.yml@main
+    uses: s3rj1k/actions-template/.github/workflows/cd-scp.yml@prebuild_script
     strategy:
       matrix:
         os:

CMakeLists.txt

@@ -260,23 +260,24 @@ if("${CMAKE_OS_NAME}" STREQUAL "Debian")
 		set(CHANGELOG_FOOTER " -- ${CPACK_DEBIAN_PACKAGE_MAINTAINER}  ${RFC2822_TIMESTAMP}")
 	endif()
 
-	# Set version release from environment variable
+	# Guess version release from environment variable
+	# (usage of CPACK_DEBIAN_PACKAGE_RELEASE breaks ability to set CPACK_DEBIAN_PACKAGE_VERSION properly)
 	if (NOT "$ENV{PACKAGE_RELEASE}" STREQUAL "")
-		set(CPACK_DEBIAN_PACKAGE_RELEASE "$ENV{PACKAGE_RELEASE}")
+		set(PACKAGE_RELEASE "$ENV{PACKAGE_RELEASE}")
 	else()
 		if(DATE_CMD)
 			execute_process(COMMAND ${DATE_CMD} +%Y%m%d OUTPUT_VARIABLE DATE_YMD)
-			set(CPACK_DEBIAN_PACKAGE_RELEASE ${DATE_YMD})
+			set(PACKAGE_RELEASE ${DATE_YMD})
 		else()
-			set(CPACK_DEBIAN_PACKAGE_RELEASE "1")
+			set(PACKAGE_RELEASE "1")
 		endif()
 	endif()
 
 	# Set package version
-	set(CPACK_DEBIAN_PACKAGE_VERSION ${PROJECT_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}~${DISTRO_CODENAME})
+	set(CPACK_DEBIAN_PACKAGE_VERSION ${PROJECT_VERSION}-${PACKAGE_RELEASE}~${DISTRO_CODENAME})
 
 	# Set debian file name format
-	set(CPACK_DEBIAN_FILE_NAME "${PACKAGE_NAME}_${PROJECT_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${DISTRO_CODENAME}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
+	set(CPACK_DEBIAN_FILE_NAME "${PACKAGE_NAME}_${PROJECT_VERSION}-${PACKAGE_RELEASE}_${DISTRO_CODENAME}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
 
 	# Set a Debian compliant changelog header
 	set(CHANGELOG_HEADER "libks (${CPACK_DEBIAN_PACKAGE_VERSION}) ${DISTRO_CODENAME}\; urgency=${CPACK_DEBIAN_PACKAGE_PRIORITY}")
@@ -328,6 +329,7 @@ if("${CMAKE_OS_NAME}" STREQUAL "Debian")
 	else()
 		message(WARNING "DEB Generator: Can't find git and/or gzip and/or date in your path. DEB packages will be missing changelog.Debian.gz.")
 	endif()
+
 endif()
 
 # Enable packaging module