From 16dfc4f5d2871514d2c8cfc1aa13936021b457a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 12 Dec 2020 00:24:18 +0100 Subject: Only try to sign if a secret key is found. --- packaging/CPackDebUploadPPA.cmake | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'packaging/CPackDebUploadPPA.cmake') diff --git a/packaging/CPackDebUploadPPA.cmake b/packaging/CPackDebUploadPPA.cmake index 2ecc7ccbed..106c513862 100644 --- a/packaging/CPackDebUploadPPA.cmake +++ b/packaging/CPackDebUploadPPA.cmake @@ -30,6 +30,17 @@ if(DEB_UPLOAD_PPA MATCHES "mixxxbetas") set(CPACK_DEBIAN_UPSTREAM_VERSION "${CPACK_DEBIAN_UPSTREAM_VERSION}${CMAKE_MATCH_1}") endif() +# PR branches hav no access to the pgp key. Don't sign. +find_program(CPACK_DEBIAN_GPG gpg) +if(CPACK_DEBIAN_GPG) + execute_process(COMMAND ${CPACK_DEBIAN_GPG} --fingerprint "${CPACK_PACKAGE_CONTACT}" + RESULT_VARIABLE CPACK_DEBIAN_GPG_RET) +endif() +if(NOT CPACK_DEBIAN_GPG_RET EQUAL "0") + message(WARNING "No secret key found for \"${CPACK_PACKAGE_CONTACT}\", skip signing" ) + SET(CPACK_DEBIAN_DEBUILD_NOSIGN "--no-sign") +endif() + message(NOTICE "Creating mixxx_${CPACK_DEBIAN_UPSTREAM_VERSION}.orig.tar.gz") execute_process( COMMAND tar -czf "mixxx_${CPACK_DEBIAN_UPSTREAM_VERSION}.orig.tar.gz" ${CPACK_PACKAGE_FILE_NAME} @@ -78,7 +89,7 @@ foreach(RELEASE ${CPACK_DEBIAN_DISTRIBUTION_RELEASES}) set(CPACK_DEBIAN_DEBUILD_BUILD "-b") endif() if (DEB_UPLOAD_PPA OR DEB_SOURCEPKG) - execute_process(COMMAND ${CPACK_DEBIAN_DEBUILD} -S -sa + execute_process(COMMAND ${CPACK_DEBIAN_DEBUILD} -S -sa ${CPACK_DEBIAN_DEBUILD_NOSIGN} WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME} RESULT_VARIABLE CPACK_DEBIAN_DEBUILD_RET) if(NOT CPACK_DEBIAN_DEBUILD_RET EQUAL "0") @@ -86,7 +97,7 @@ foreach(RELEASE ${CPACK_DEBIAN_DISTRIBUTION_RELEASES}) endif() endif() if (BUILD_MACHINE_RELEASE STREQUAL RELEASE AND DEB_BUILD) - execute_process(COMMAND ${CPACK_DEBIAN_DEBUILD} -b -uc -us + execute_process(COMMAND ${CPACK_DEBIAN_DEBUILD} -b ${CPACK_DEBIAN_DEBUILD_NOSIGN} WORKING_DIRECTORY ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}) endif() if(DEB_UPLOAD_PPA) -- cgit v1.2.3