Merge branch 'release/0.4.2'

citusdata · Sep 27, 2016 · 1cadc28 · 1cadc28
2 parents 064fb1c + 434bec8
commit 1cadc28
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### citustools v0.4.2 (September 27, 2016) ###
+
+* Adds support for building the HyperLogLog package
+
 ### citustools v0.4.1 (August 19, 2016) ###
 
 * Multi test now requires args rather than using hardcoded targets

diff --git a/packaging/citus_package b/packaging/citus_package
@@ -241,7 +241,7 @@ if ( @ARGV != 2 ) {
 
 ( $project, $build_type ) = @ARGV;
 
-if ( $project =~ /^(citus|enterprise|rebalancer)$/x ) {
+if ( $project =~ /^(citus|enterprise|hll|rebalancer)$/x ) {
     $project = $1;
 }
 else {
@@ -411,6 +411,8 @@ to sign packages.
 
 =item I<enterprise>     Citus Enterprise
 
+=item I<hll>            HyperLogLog
+
 =item I<rebalancer>     Shard Rebalancer
 
 =back

diff --git a/travis/build_new_nightly b/travis/build_new_nightly
@@ -15,21 +15,23 @@ hubauth="Authorization: token ${GITHUB_TOKEN}"
 projname="${TRAVIS_BRANCH##*-}"
 repotype="enterprise"
 
-if [ "${projname}" == 'citus' ]; then
-    repotype="community"
-fi
-
 devbranch='master'
 case "${projname}" in
     citus)
         hubproj='citus'
         pkgbase="${hubproj}"
+        repotype='community'
         ;;
     enterprise)
         hubproj='citus-enterprise'
         devbranch='enterprise-master'
         pkgbase="${hubproj}"
         ;;
+    hll)
+        hubproj='postgresql-hll'
+        pkgbase='hll'
+        repotype='community'
+        ;;
     rebalancer)
         hubproj='shard_rebalancer'
         pkgbase='citus-rebalancer'

diff --git a/travis/build_new_release b/travis/build_new_release
@@ -14,19 +14,21 @@ pkgauth="${PACKAGECLOUD_API_TOKEN}:"
 projname="${TRAVIS_BRANCH##*-}"
 repotype="enterprise"
 
-if [ "${projname}" == 'citus' ]; then
-    repotype="community"
-fi
-
 case "${projname}" in
     citus)
         hubproj='citus'
         pkgbase="${hubproj}"
+        repotype='community'
         ;;
     enterprise)
         hubproj='citus-enterprise'
         pkgbase="${hubproj}"
         ;;
+    hll)
+        hubproj='postgresql-hll'
+        pkgbase='hll'
+        repotype='community'
+        ;;
     rebalancer)
         hubproj='shard_rebalancer'
         pkgbase='citus-rebalancer'

diff --git a/travis/fetch_build_files b/travis/fetch_build_files
@@ -20,7 +20,7 @@ usage() {
     cat << 'E_O_USAGE' >&"$1"
 usage: fetch_build_files project format target_directory
 
-    project : 'citus', 'enterprise', or 'rebalancer'
+    project : 'citus', 'enterprise', 'hll', or 'rebalancer'
     format : 'deb', 'rpm', or 'pgxn'
 
 fetch_build_files fetches files needed to package a specified Citus project for
@@ -39,7 +39,7 @@ if [ "$#" -ne 3 ]; then
 fi
 
 case "${1}" in
-    citus|enterprise|rebalancer)
+    citus|enterprise|hll|rebalancer)
         project=${1}
         ;;
     *)

diff --git a/travis/parse_latest_release b/travis/parse_latest_release
@@ -17,7 +17,7 @@ usage() {
     cat << 'E_O_USAGE' >&"$1"
 usage: parse_latest_release project format build_directory
 
-    project : 'citus', 'enterprise', or 'rebalancer'
+    project : 'citus', 'enterprise', 'hll', or 'rebalancer'
     format : 'deb', 'rpm', or 'pgxn'
 
 parse_latest_release extracts the latest stable release from the build files
@@ -56,6 +56,9 @@ case "${1}" in
     enterprise)
         specfile='citus-enterprise.spec'
         ;;
+    hll)
+        specfile='hll.spec'
+        ;;
     rebalancer)
         specfile='citus-rebalancer.spec'
         ;;