Try to revive nightly ppa by advance to alpha~pre1

mixxxdj · Jan 15, 2021 · a5552e4 · a5552e4
1 parent 47d69b8
commit a5552e4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packaging/CPackDebUploadPPA.cmake b/packaging/CPackDebUploadPPA.cmake
@@ -25,11 +25,16 @@ if(NOT CPACK_DEBIAN_MARKDOWN)
 endif()
 
 # hack from sconscript
-if(DEB_UPLOAD_PPA MATCHES "mixxxbetas" OR DEB_UPLOAD_PPA MATCHES "nightlies")
+if(DEB_UPLOAD_PPA MATCHES "mixxxbetas")
   string(REGEX MATCH "^.*(~git[0-9]*).*$" GITVERSION "${CPACK_DEBIAN_DEBIAN_VERSION_EXTRA}")
   set(CPACK_DEBIAN_UPSTREAM_VERSION "${CPACK_DEBIAN_UPSTREAM_VERSION}${CMAKE_MATCH_1}")
 endif()
 
+if(DEB_UPLOAD_PPA MATCHES "nightlies")
+  string(REGEX MATCH "^.*(~git[0-9]*).*$" GITVERSION "${CPACK_DEBIAN_DEBIAN_VERSION_EXTRA}")
+  set(CPACK_DEBIAN_UPSTREAM_VERSION "${CPACK_DEBIAN_UPSTREAM_VERSION}1${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)