Merge branch 'release/0.6.1'

CHANGELOG.md

@@ -1,3 +1,9 @@
+### citustools v0.6.1 (May 12, 2017) ###
+
+* Adds logic to apply PGDG's directory patches to custom builds
+
+* Fixes bug preventing builds where `USE_CUSTOM_PG` is undefined
+
 ### citustools v0.6.0 (May 5, 2017) ###
 
 * Adds scripts to query, normalize, and load download KPI data

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.5.0.tar.gz"
-  sha256 "dd0eb39686f7c2cd61084ed3bbf52ffe7ea6fe60d715b6bf4ca3a7b775c30ec9"
+  url "https://github.com/citusdata/tools/archive/v0.6.0.tar.gz"
+  sha256 "85644f4910e17ed378748d930cf86e98b9316243467c8a6f009de8001a5bdbff"
 
   depends_on "uncrustify"
   depends_on Docker

travis/install_custom_pg

@@ -3,10 +3,17 @@
 set -eux
 
 # exit early if a custom build is not needed
-if [ -z "${USE_CUSTOM_PG}" ]; then
+if [ -z "${USE_CUSTOM_PG:-}" ]; then
   exit
 fi
 
+# in order for other PostgreSQL packages to operate correctly, we need
+# to ensure our build uses the same directories as the PGDG build; un-
+# fortunately, not all can be specified by ./configure, so we apply the
+# version-specific packaging patch used for the PGDG builds
+pkgingurl='https://anonscm.debian.org/git/pkg-postgresql/postgresql.git'
+patchurl="${pkgingurl}/plain/debian/patches/50-per-version-dirs.patch"
+
 # clone PostgreSQL
 cd ~
 git clone -b "REL${PGVERSION//./_}_STABLE" --depth 1 git://git.postgresql.org/git/postgresql.git
@@ -15,8 +22,10 @@ git clone -b "REL${PGVERSION//./_}_STABLE" --depth 1 git://git.postgresql.org/gi
 procs="$(nproc)"
 mjobs="$((procs + 1))"
 
-# configure, build and install PostgreSQL
+# configure, apply patch, build, and install PostgreSQL
 cd postgresql
+curl -sf "${patchurl}?h=${PGVERSION}" | git apply
+
 ./configure --enable-cassert --enable-debug --with-openssl \
     --mandir="/usr/share/postgresql/${PGVERSION}/man" \
     --docdir="/usr/share/doc/postgresql-doc-${PGVERSION}" \

travis/install_pg

@@ -5,7 +5,7 @@
 set -eux
 
 # exit early if a custom build is needed
-if [ -n "${USE_CUSTOM_PG}" ]; then
+if [ -n "${USE_CUSTOM_PG:-}" ]; then
     exit
 fi
 

travis/nuke_pg

@@ -8,7 +8,7 @@ set -eux
 sudo service postgresql stop
 
 # remove existing installation of postgresql
-if [ -n "${USE_CUSTOM_PG}" ]; then
+if [ -n "${USE_CUSTOM_PG:-}" ]; then
     sudo apt-get --purge -y remove postgresql-*
 fi
 

travis/pg_travis_multi_test

@@ -22,7 +22,7 @@ cd src/test/regress
 
 # if a custom build is in use, we will also run check-vanilla
 # and check-isolation along with regular regression tests
-if [ -n "${USE_CUSTOM_PG}" ]; then
+if [ -n "${USE_CUSTOM_PG:-}" ]; then
     testtargets="${testtargets} check-vanilla check-isolation"
 fi