Merge branch 'release/0.7.1'

CHANGELOG.md

@@ -1,3 +1,11 @@
+### citustools v0.7.1 (August 30, 2017) ###
+
+* Add support for testing against PostgreSQL 11/master branch
+
+* Fixes bug causing early exit during first nightly of new OS/package
+
+* Add `--enable-depend` to avoid build problems with changed headers
+
 ### citustools v0.7.0 (August 30, 2017) ###
 
 * Removes Ubuntu Precise from supported packaging versions
@@ -18,7 +26,7 @@
 
 * Adds automation script for valgrind tests
 
-* Starts to use REL_10_STABLE branch for PostgreSQL tests
+* Starts to use `REL_10_STABLE` branch for PostgreSQL tests
 
 ### citustools v0.6.3 (July 11, 2017) ###
 

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.6.3.tar.gz"
-  sha256 "5e2dc61136be940f436911ad17908bb48d8c6362ed8407d32c405b5a8e982d72"
+  url "https://github.com/citusdata/tools/archive/v0.7.0.tar.gz"
+  sha256 "719e82f051e123dcf3a087fc49ceaacd86f76dbaea24fe886beaee742cce533f"
 
   depends_on "uncrustify"
   depends_on Docker

travis/build_new_nightly

@@ -44,9 +44,24 @@ esac
 pkgapiurl="https://packagecloud.io/api/v1/repos/citusdata/${PKG_REPOTYPE}-nightlies"
 pkgapiurl+="/package/${pkgflavor}/${TARGET_PLATFORM}/${pkgfull}/${pkgarch}/versions.json"
 
+response=$(curl -w '\n%{http_code}\n' -s -u "${pkgauth}" "${pkgapiurl}?per_page=1000")
+
+httpcode=$(echo "${response}" | tail -n1)
+case "${httpcode}" in
+    404)
+        httpbody='[]'
+        ;;
+    200)
+        httpbody=$(echo "${response}" | sed '$d')
+        ;;
+    *)
+        echo "$0: bad response code from packagecloud -- ${httpcode}" >&2
+        exit $noservice
+        ;;
+esac
+
 epochstr='"1970-01-01T00:00:00.000Z"'
-lastnightly=$(curl -sf -u "${pkgauth}" "${pkgapiurl}?per_page=1000" | \
-              jq -r "map(.created_at) | sort | last // ${epochstr}")
+lastnightly=$(echo "${httpbody}" | jq -r "map(.created_at) | sort | last // ${epochstr}")
 
 hubapiurl="https://api.github.com/repos/citusdata/${hubproj}/commits?"
 hubapiurl+="sha=${nightlyref}&since=${lastnightly}&per_page=1"

travis/install_custom_pg

@@ -16,12 +16,14 @@ cd ~
 if [ "$(ls -A postgresql)" ]; then
   git -C postgresql pull
 else
-  if [ "${PGVERSION}" == '11' ]; then
+  pgmajornum="${PGVERSION%%.*}"
+  if [ "${pgmajornum}" -gt '10' ]; then
+    # ten is highest stable build; use master for higher
     gitref="master"
-  elif [ "${PGVERSION}" == '9.6' ]; then
-    gitref="REL9_6_STABLE"
-  else
+  elif [ "${pgmajornum}" -gt '9' ]; then
     gitref="REL_${PGVERSION}_STABLE"
+  else
+    gitref="REL${PGVERSION//./_}_STABLE"
   fi
 
   git clone -b "${gitref}" --depth 1 git://git.postgresql.org/git/postgresql.git
@@ -43,7 +45,7 @@ mjobs="$((procs + 1))"
 
 # configure, build, and install PostgreSQL
 cd postgresql
-./configure --enable-cassert --enable-debug --with-openssl \
+./configure --enable-cassert --enable-debug --enable-depend --with-openssl \
     --mandir="/usr/share/postgresql/${PGVERSION}/man" \
     --docdir="/usr/share/doc/postgresql-doc-${PGVERSION}" \
     --sysconfdir=/etc/postgresql-common \

travis/setup_apt

@@ -10,14 +10,16 @@ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ACCC4CF8
 # wtf, Google?
 sudo rm /etc/apt/sources.list.d/google-chrome*
 
-# add the PostgreSQL 9.5 repository
+# add the PostgreSQL 9.5 and 10 repositories
 sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main 9.5" >> /etc/apt/sources.list.d/postgresql.list'
+sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main 10" >> /etc/apt/sources.list.d/postgresql.list'
 
-if [ "${PGVERSION}" == "10" ]; then
-    # add the PostgreSQL 10 testing repository
-    sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg-testing main 10" >> /etc/apt/sources.list.d/postgresql.list'
+# need testing repository after version 10
+if [ "${PGVERSION%%.*}" -gt '10' ]; then
+    # add a PostgreSQL testing repository
+    sudo sh -Ec 'echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg-testing main ${PGVERSION}" >> /etc/apt/sources.list.d/postgresql.list'
 
-    sudo sh -c 'echo "Package: *\nPin: release n=trusty-pgdg-testing\nPin-Priority: 600" >> /etc/apt/preferences.d/postgresql.pref'
+    sudo sh -c 'echo "Package: *\nPin: release n=$(lsb_release -cs)-pgdg-testing\nPin-Priority: 600" >> /etc/apt/preferences.d/postgresql.pref'
 fi
 
 # update package index files from sources