Skip to content

Support different pkgname for debian and rpm #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JelteF merged 1 commit into from
May 6, 2020
Merged

Support different pkgname for debian and rpm #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion travis/build_new_nightly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
Expand All @@ -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"
;;
Expand All @@ -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"

Expand Down
5 changes: 4 additions & 1 deletion travis/build_new_release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:-}"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"

Expand Down