Skip to content

Commit

Permalink
Merge branch 'release/0.7.13' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
hanefi committed Oct 16, 2019
2 parents beff7c8 + 5b24139 commit 22e1916
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 6 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
### citustools v0.7.11 (Aughust 18, 2019) ###
### citustools v0.7.13 (October 09, 2019) ###

* Introduces `citus_dev`

* Adds Debian Bionic and EL/OL 8 to supported packaging versions

* Changes the docker hub org from CitusData to Citus for packaging

### citustools v0.7.12 (September 02, 2019) ###

* Add support for testing against PostgreSQL 12

### citustools v0.7.11 (August 18, 2019) ###

* Bump Homebrew formula

Expand Down
4 changes: 4 additions & 0 deletions citus_dev/citus_dev
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ from subprocess import call
from subprocess import Popen, PIPE
import os
import sys
import getpass


def createNodeCommands(clustername, role, index=None, usessl=False, mx=False):
Expand Down Expand Up @@ -103,6 +104,9 @@ def main(arguments):
port += 1
port = cport

if getpass.getuser() != 'postgres' and not os.getenv('PGDATABASE'):
for i in range(size + 1):
cs.append('createdb -p %d' % (port + i))

if not arguments["--no-extension"]:
for i in range(size + 1):
Expand Down
16 changes: 11 additions & 5 deletions packaging/citus_package
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ use constant PACKAGE_URL => ## no critic (ProhibitConstantPragma)
'https://github.com/citusdata/packaging/archive';

my %supported_platforms = (
debian => [ "stretch", "jessie", "wheezy"],
el => [ "7", "6" ],
debian => [ "buster", "stretch", "jessie", "wheezy"],
el => [ "8", "7", "6" ],
fedora => [ "28", "27", "26"],
ol => [ "7", "6" ],
ol => [ "8", "7", "6" ],
ubuntu => [ "bionic", "xenial", "trusty" ],
pgxn => [""]
);
Expand Down Expand Up @@ -369,7 +369,7 @@ foreach my $platform (@platforms) {
"$filesubdir:/buildfiles:ro",
'-e',
"GITHUB_TOKEN",
"citusdata/packaging:$docker_platform-$pg",
"citus/packaging:$docker_platform-$pg",
$build_type
);

Expand Down Expand Up @@ -494,12 +494,16 @@ to sign packages.
=over 4
=item I<debian/buster> Debian 10 "Buster"
=item I<debian/stretch> Debian 9 "Stretch"
=item I<debian/jessie> Debian 8 "Jessie"
=item I<debian/wheezy> Debian 7 "Wheezy"
=item I<el/8> Enterprise Linux 8.0 (CentOS, RedHat, Amazon Linux)
=item I<el/7> Enterprise Linux 7.0 (CentOS, RedHat, Amazon Linux)
=item I<el/6> Enterprise Linux 6.0 (CentOS, RedHat, Amazon Linux)
Expand All @@ -510,6 +514,8 @@ to sign packages.
=item I<fedora/26> Fedora 26
=item I<ol/8> Oracle Linux 8.0
=item I<ol/7> Oracle Linux 7.0
=item I<ol/6> Oracle Linux 6.0
Expand Down Expand Up @@ -541,7 +547,7 @@ Citus package, only the I<release> build type may be used.
=item L<Citus Packaging on GitHub|https://github.com/citusdata/packaging>
=item L<Citus Packaging on Docker Hub|https://hub.docker.com/r/citusdata/packaging>
=item L<Citus Packaging on Docker Hub|https://hub.docker.com/r/citus/packaging>
=item L<Docker|https://www.docker.com>
Expand Down

0 comments on commit 22e1916

Please sign in to comment.