Put name of distribution and version in generated packages.
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
9ed41d6ac8
commit
051cc273b7
16
.drone.yml
16
.drone.yml
|
@ -116,8 +116,8 @@ steps:
|
|||
- make package
|
||||
- gpg --import /var/autosign_gpg.key
|
||||
- gpg --verbose --detach-sign *.deb
|
||||
- cp -v identiconpp_${DRONE_TAG}-0_amd64.deb ..
|
||||
- cp -v identiconpp_${DRONE_TAG}-0_amd64.deb.sig ..
|
||||
- cp -v identiconpp_${DRONE_TAG}-0_amd64_stretch.deb ..
|
||||
- cp -v identiconpp_${DRONE_TAG}-0_amd64_stretch.deb.sig ..
|
||||
volumes:
|
||||
- name: debian-package-cache
|
||||
path: /var/cache/apt/archives
|
||||
|
@ -145,8 +145,8 @@ steps:
|
|||
- make package
|
||||
- gpg --import /var/autosign_gpg.key
|
||||
- gpg --verbose --detach-sign *.rpm
|
||||
- cp -v identiconpp-${DRONE_TAG}-0.x86_64.rpm ..
|
||||
- cp -v identiconpp-${DRONE_TAG}-0.x86_64.rpm.sig ..
|
||||
- cp -v identiconpp-${DRONE_TAG}-0.x86_64.centos7.rpm ..
|
||||
- cp -v identiconpp-${DRONE_TAG}-0.x86_64.centos7.rpm.sig ..
|
||||
volumes:
|
||||
- name: centos-package-cache
|
||||
path: /var/cache/yum
|
||||
|
@ -163,10 +163,10 @@ steps:
|
|||
title: ${DRONE_TAG}
|
||||
prerelease: true
|
||||
files:
|
||||
- identiconpp_${DRONE_TAG}-0_amd64.deb
|
||||
- identiconpp_${DRONE_TAG}-0_amd64.deb.sig
|
||||
- identiconpp-${DRONE_TAG}-0.x86_64.rpm
|
||||
- identiconpp-${DRONE_TAG}-0.x86_64.rpm.sig
|
||||
- identiconpp_${DRONE_TAG}-0_amd64_stretch.deb
|
||||
- identiconpp_${DRONE_TAG}-0_amd64_stretch.deb.sig
|
||||
- identiconpp-${DRONE_TAG}-0.x86_64.centos7.rpm
|
||||
- identiconpp-${DRONE_TAG}-0.x86_64.centos7.rpm.sig
|
||||
checksum:
|
||||
- sha512
|
||||
|
||||
|
|
|
@ -32,7 +32,8 @@ if (WITH_DEB)
|
|||
OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
set(CPACK_PACKAGE_FILE_NAME
|
||||
"${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-0_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
|
||||
"${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-0_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}_${DEBIAN_CO
|
||||
DENAME}")
|
||||
endif()
|
||||
|
||||
if (WITH_RPM)
|
||||
|
@ -43,6 +44,13 @@ if (WITH_RPM)
|
|||
set(CPACK_RPM_PACKAGE_REQUIRES "libMagick++")
|
||||
set(CPACK_PACKAGE_FILE_NAME
|
||||
"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-0.${CPACK_PACKAGE_ARCHITECTURE}")
|
||||
if("${OS}" STREQUAL "CentOS")
|
||||
execute_process(COMMAND rpm -E %{rhel}
|
||||
OUTPUT_VARIABLE OS_RELEASE
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
set(CPACK_PACKAGE_FILE_NAME
|
||||
"${CPACK_PACKAGE_FILE_NAME}.centos${OS_RELEASE}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
include(CPack)
|
||||
|
|
Loading…
Reference in New Issue