Merge branch 'release/0.4.3'

citusdata · Sep 30, 2016 · 5b4c646 · 5b4c646
2 parents 1cadc28 + 54f5efb
commit 5b4c646
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### citustools v0.4.3 (September 30, 2016) ###
+
+* Make Travis install scripts PostgreSQL 9.6-aware
+
 ### citustools v0.4.2 (September 27, 2016) ###
 
 * Adds support for building the HyperLogLog package

diff --git a/HomebrewFormula/citustools.rb b/HomebrewFormula/citustools.rb
@@ -12,8 +12,8 @@ def message
 class Citustools < Formula
   desc "Tools and config used in Citus Data projects."
   homepage "https://github.com/citusdata/tools"
-  url "https://github.com/citusdata/tools/archive/v0.4.0.tar.gz"
-  sha256 "97ee8978eba59abf517af480880387709a116e76de00fbd5004778342cf462e1"
+  url "https://github.com/citusdata/tools/archive/v0.4.2.tar.gz"
+  sha256 "b12706bd3dc88d788711c3beebddf377710e9c9ab0ba7207634d5eaa1b118865"
 
   depends_on "uncrustify"
   depends_on Docker

diff --git a/travis/install_citus b/travis/install_citus
@@ -6,7 +6,7 @@ set -eux
 
 # we set PGVERSION to 10x of the Citus version when testing Citus, so
 # only install PostgreSQL proper if it's greater than 9.5
-if [ "${PGVERSION//./}" -gt "95" ]; then
+if [ "${PGVERSION//./}" -gt "96" ]; then
   cituspkgs="$HOME/.cache/citusdb_pkgs"
   citusversion="$((${PGVERSION//./} / 100)).0"
   citusdownload="citusdb-${citusversion}.0-1.amd64.deb"

diff --git a/travis/install_pg b/travis/install_pg
@@ -9,7 +9,7 @@ packages="postgresql-common libedit-dev libpam0g-dev libselinux1-dev"
 
 # we set PGVERSION to 10x of the Citus version when testing Citus, so
 # only install PostgreSQL proper if it's 9.5 or lower
-if [ "${PGVERSION//./}" -le "95" ]; then
+if [ "${PGVERSION//./}" -le "96" ]; then
   packages="$packages postgresql-$PGVERSION postgresql-server-dev-$PGVERSION"
 fi