Merge branch 'develop'

citusdata · May 6, 2020 · 1bab1ce · 1bab1ce
2 parents 4e52985 + b85d795
commit 1bab1ce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/travis/build_new_nightly b/travis/build_new_nightly
@@ -23,7 +23,6 @@ hubauth="Authorization: token ${GITHUB_TOKEN}"
 source pkgvars
 
 # set default values for certain packaging variables
-hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
 releasepg="${releasepg:-9.6,10}"
 nightlypg="${nightlypg:-${releasepg}}"
@@ -32,11 +31,13 @@ latestpg=$(echo "${nightlypg}" | tr ',' '\n' | sort -t. -k1,1n -k2,2n | tail -n1
 case "${PLATFORM_TYPE}" in
     debian|ubuntu)
         pkgflavor='deb'
+        pkgname="${deb_pkgname:-${pkgname}}"
         pkgfull="postgresql-${latestpg}-${pkgname}"
         pkgarch="amd64"
         ;;
     el|ol)
         pkgflavor='rpm'
+        pkgname="${rpm_pkgname:-${pkgname}}"
         pkgfull="${pkgname}_${latestpg//./}"
         pkgarch="x86_64"
         ;;
@@ -46,6 +47,8 @@ case "${PLATFORM_TYPE}" in
         ;;
 esac
 
+hubproj="${hubproj:-${pkgname}}"
+
 pkgapiurl="https://packagecloud.io/api/v1/repos/citusdata/${PKG_REPOTYPE}-nightlies"
 pkgapiurl+="/package/${pkgflavor}/${TARGET_PLATFORM}/${pkgfull}/${pkgarch}/versions.json"
 

diff --git a/travis/build_new_release b/travis/build_new_release
@@ -23,7 +23,6 @@ source pkgvars
 
 # set default values for certain packaging variables
 declare pkglatest # to make shellcheck happy
-hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
 releasepg="${releasepg:-9.6,10}"
 nightlypg="${nightlypg:-}"
@@ -33,6 +32,7 @@ versioning="${versioning:-simple}"
 case "${PLATFORM_TYPE}" in
     debian|ubuntu)
         pkgflavor='deb'
+        pkgname="${deb_pkgname:-${pkgname}}"
         pkgfull="postgresql-${latestpg}-${pkgname}"
 
         # add minor/major version to package name if using fancy versioning
@@ -46,6 +46,7 @@ case "${PLATFORM_TYPE}" in
         ;;
     el|ol)
         pkgflavor='rpm'
+        pkgname="${rpm_pkgname:-${pkgname}}"
 
         # add minor/major version to package name if using fancy versioning
         if [ "${versioning}" == 'fancy' ]; then
@@ -64,6 +65,8 @@ case "${PLATFORM_TYPE}" in
         ;;
 esac
 
+hubproj="${hubproj:-${pkgname}}"
+
 pkgapiurl="https://packagecloud.io/api/v1/repos/citusdata/${PKG_REPOTYPE}"
 pkgapiurl+="/package/${pkgflavor}/${TARGET_PLATFORM}/${pkgfull}/${pkgarch}/versions.json"