Merge branch 'release/0.7.2'

citusdata · Oct 5, 2017 · 62231e4 · 62231e4
2 parents 5964e43 + 3061f42
commit 62231e4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### citustools v0.7.2 (October 5, 2017) ###
+
+* Changes packaging default PostgreSQL versions from 9.5,9.6 to 9.6,10
+
 ### citustools v0.7.1 (August 30, 2017) ###
 
 * Add support for testing against PostgreSQL 11/master branch

diff --git a/packaging/citus_package b/packaging/citus_package
@@ -322,7 +322,7 @@ foreach my $platform (@platforms) {
     # read release and nightly PG versions from pkgvars file
     my @pg_versions;
     if ( $format eq 'redhat' ) {
-        my $releasepg = '9.5,9.6';
+        my $releasepg = '9.6,10';
         my $nightlypg;
         my $pkgvars = "$filesubdir/pkgvars";
 

diff --git a/travis/README.md b/travis/README.md
@@ -22,7 +22,7 @@ It is possible that your Travis CI virtual machine starts with a PostgreSQL inst
 
 ### `install_pg`
 
-A PostgreSQL version will be installed based on the value of the `PGVERSION` environment variable. In addition, common extension dependencies and development headers are installed. Suitable values for `PGVERSION` might be `9.3`, `9.4`, or `9.5`.
+A PostgreSQL version will be installed based on the value of the `PGVERSION` environment variable. In addition, common extension dependencies and development headers are installed. Suitable values for `PGVERSION` might be `9.5`, `9.6`, or `10`.
 
 ### `install_uncrustify`
 

diff --git a/travis/build_new_nightly b/travis/build_new_nightly
@@ -8,7 +8,7 @@ IFS=$'\n\t'
 stderr=2
 badusage=64
 
-latestpg="9.5"
+latestpg="10"
 pkgflavor="${TRAVIS_BRANCH%%-*}"
 pkgauth="${PACKAGECLOUD_API_TOKEN}:"
 hubauth="Authorization: token ${GITHUB_TOKEN}"
@@ -20,7 +20,7 @@ source pkgvars
 # set default values for certain packaging variables
 hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
-releasepg="${releasepg:-9.5,9.6}"
+releasepg="${releasepg:-9.6,10}"
 nightlypg="${nightlypg:-${releasepg}}"
 latestpg=$(echo "${nightlypg}" | tr ',' '\n' | sort -t. -k1,1n -k2,2n | tail -n1)
 

diff --git a/travis/build_new_release b/travis/build_new_release
@@ -20,7 +20,7 @@ source pkgvars
 declare pkglatest # to make shellcheck happy
 hubproj="${hubproj:-${pkgname}}"
 nightlyref="${nightlyref:-master}"
-releasepg="${releasepg:-9.5,9.6}"
+releasepg="${releasepg:-9.6,10}"
 nightlypg="${nightlypg:-${releasepg}}"
 latestpg=$(echo "${releasepg}" | tr ',' '\n' | sort -t. -k1,1n -k2,2n | tail -n1)
 versioning="${versioning:-simple}"