Merge pull request #62 from citusdata/simplify-branching

Author: JelteF

automated_packaging/update_os_package.pl

@@ -69,12 +69,12 @@ sub get_changelog_for_debian {
 `sed -i 's/^pkglatest.*/pkglatest=$VERSION.citus-1/g' pkgvars`;
 
 # Based on the repo, update the package related variables
-if ( $DISTRO_VERSION eq "redhat" || $DISTRO_VERSION eq "microsoft") {
+if ( $DISTRO_VERSION eq "redhat" || $DISTRO_VERSION eq "microsoft" || $DISTRO_VERSION eq "all") {
     `sed -i 's|^Version:.*|Version:	$VERSION.citus|g' $github_repo_name.spec`;
     `sed -i 's|^Source0:.*|Source0:	https:\/\/github.com\/citusdata\/$github_repo_name\/archive\/v$VERSION.tar.gz|g' $github_repo_name.spec`;
     `sed -i 's|^%changelog|%changelog\\n* $abbr_day[$wday] $abbr_mon[$mon] $mday $year - $git_name <$microsoft_email> $VERSION.citus-1\\n- Update to $log_repo_name $VERSION\\n|g' $github_repo_name.spec`;
 }
-if ( $DISTRO_VERSION eq "debian" || $DISTRO_VERSION eq "microsoft") {
+if ( $DISTRO_VERSION eq "debian" || $DISTRO_VERSION eq "microsoft" || $DISTRO_VERSION eq "all") {
     open( DEB_CLOG_FILE, "<./debian/changelog" ) || die "Debian changelog file not found";
     my @lines = <DEB_CLOG_FILE>;
     close(DEB_CLOG_FILE);

packaging/citus_package

@@ -371,6 +371,8 @@ foreach my $platform (@platforms) {
             "GITHUB_TOKEN",
             '-e',
             "PACKAGE_ENCRYPTION_KEY",
+            '-e',
+            "UNENCRYPTED_PACKAGE",
             "citus/packaging:$docker_platform-$pg",
             $build_type
         );

travis/build_new_nightly

@@ -9,7 +9,12 @@ stderr=2
 badusage=64
 
 latestpg="10"
-pkgflavor="${TRAVIS_BRANCH%%-*}"
+if [ "${TARGET_PLATFORM:-}" = "" ]; then
+    echo TARGET_PLATFORM must be set
+    exit $badusage
+fi
+
+PLATFORM_TYPE="${TARGET_PLATFORM%%/*}"
 pkgauth="${PACKAGECLOUD_API_TOKEN}:"
 hubauth="Authorization: token ${GITHUB_TOKEN}"
 
@@ -24,13 +29,13 @@ releasepg="${releasepg:-9.6,10}"
 nightlypg="${nightlypg:-${releasepg}}"
 latestpg=$(echo "${nightlypg}" | tr ',' '\n' | sort -t. -k1,1n -k2,2n | tail -n1)
 
-case "${pkgflavor}" in
-    debian)
+case "${PLATFORM_TYPE}" in
+    debian|ubuntu)
         pkgflavor='deb'
         pkgfull="postgresql-${latestpg}-${pkgname}"
         pkgarch="amd64"
         ;;
-    redhat)
+    el|ol)
         pkgflavor='rpm'
         pkgfull="${pkgname}_${latestpg//./}"
         pkgarch="x86_64"

travis/build_new_release

@@ -9,7 +9,12 @@ stderr=2
 badusage=64
 noservice=69
 
-pkgflavor="${TRAVIS_BRANCH%%-*}"
+if [ "${TARGET_PLATFORM:-}" = "" ]; then
+    echo TARGET_PLATFORM must be set
+    exit $badusage
+fi
+
+PLATFORM_TYPE="${TARGET_PLATFORM%%/*}"
 pkgauth="${PACKAGECLOUD_API_TOKEN}:"
 
 # populate variables from packaging metadata file
@@ -21,12 +26,12 @@ declare pkglatest # to make shellcheck happy
 hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
 releasepg="${releasepg:-9.6,10}"
-nightlypg="${nightlypg:-${releasepg}}"
+nightlypg="${nightlypg:-}"
 latestpg=$(echo "${releasepg}" | tr ',' '\n' | sort -t. -k1,1n -k2,2n | tail -n1)
 versioning="${versioning:-simple}"
 
-case "${pkgflavor}" in
-    debian)
+case "${PLATFORM_TYPE}" in
+    debian|ubuntu)
         pkgflavor='deb'
         pkgfull="postgresql-${latestpg}-${pkgname}"
 
@@ -39,7 +44,7 @@ case "${pkgflavor}" in
         pkgarch="amd64"
         jqfilter='map(.version + "-" + .release)'
         ;;
-    redhat)
+    el|ol)
         pkgflavor='rpm'
 
         # add minor/major version to package name if using fancy versioning