diff --git a/CHANGELOG.md b/CHANGELOG.md index 48e2d8de..eaa79564 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +### citustools v0.7.11 (Aughust 18, 2019) ### + +* Bump Homebrew formula + +* Update couple of uncrustify settings + +* Update alpine dockerfiles + +* Use Microsoft mails for Valgrind test results + ### citustools v0.7.10 (May 28, 2019) ### * Add custom branch support for valgrind tests diff --git a/automated_packaging/update_docker.pl b/automated_packaging/update_docker.pl index e3a61acc..1ae30ed2 100644 --- a/automated_packaging/update_docker.pl +++ b/automated_packaging/update_docker.pl @@ -30,6 +30,10 @@ `sed -i 's/VERSION=[[:digit:]]*.[[:digit:]]*.[[:digit:]]*/VERSION=$VERSION/g' Dockerfile`; `sed -i 's/PG_MAJOR-citus-[[:digit:]]*.[[:digit:]]*/PG_MAJOR-citus-$minor_version/g' Dockerfile`; +# Update citus version on alpine Dockerfile +`sed -i 's/VERSION=[[:digit:]]*.[[:digit:]]*.[[:digit:]]*/VERSION=$VERSION/g' Dockerfile-alpine`; +`sed -i 's/PG_MAJOR-citus-[[:digit:]]*.[[:digit:]]*/PG_MAJOR-citus-$minor_version/g' Dockerfile-alpine`; + # Update citus version on docker-compose `sed -i 's/citus:[[:digit:]]*.[[:digit:]]*.[[:digit:]]*/citus:$VERSION/g' docker-compose.yml`; diff --git a/uncrustify/citus-style.cfg b/uncrustify/citus-style.cfg index 0507e788..14ceb2ed 100644 --- a/uncrustify/citus-style.cfg +++ b/uncrustify/citus-style.cfg @@ -784,8 +784,8 @@ align_with_tabs = false # false/true # Whether to bump out to the next tab when aligning align_on_tabstop = false # false/true -# Whether to left-align numbers -align_number_left = false # false/true +# Whether to right-align numbers +align_number_right = false # false/true # Whether to keep whitespace not required for alignment. align_keep_extra_space = false # false/true diff --git a/uncrustify/citus_indent b/uncrustify/citus_indent index 6cc5b5c5..8ed1888d 100755 --- a/uncrustify/citus_indent +++ b/uncrustify/citus_indent @@ -12,8 +12,8 @@ delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'}; my ($quiet, $check, $diff); exit 64 unless GetOptions ('quiet' => \$quiet, 'check' => \$check, 'diff' => \$diff); -my $null_delimited_triples = ($diff ? - `git diff --cached --name-only -z | git check-attr --stdin -z citus-style` : +my $null_delimited_triples = ($diff ? + `git diff --cached --name-only --diff-filter=ACMR -z | git check-attr --stdin -z citus-style` : `git ls-files -z | git check-attr --stdin -z citus-style` ); my @flattened_triples = split(/\x00/, $null_delimited_triples); @@ -36,7 +36,7 @@ while(my ($filename, $attrname, $attrvalue) = splice(@flattened_triples, 0, 3)) # untaint filename and error if '..' is present if ($filename =~ /^(.*(?!\.\.)$)/) { - push @files_to_format, $1; + push @files_to_format, $1; } else { die "illegal filename\n"; } diff --git a/valgrind/launch-test-instance b/valgrind/launch-test-instance index 3bb2bce3..2640d69f 100755 --- a/valgrind/launch-test-instance +++ b/valgrind/launch-test-instance @@ -2,7 +2,13 @@ set -euo pipefail -REPORT_EMAIL=${REPORT_EMAIL:-burak@citusdata.com metin@citusdata.com furkan@citusdata.com} +REPORT_EMAIL=${REPORT_EMAIL:-burak@citusdata.com \ + furkan@citusdata.com \ + metin@citusdata.com \ + Burak.Yucesoy@microsoft.com \ + Furkan.Sahin@microsoft.com \ + Hanefi.Onaldi@microsoft.com \ + Metin.Doslu@microsoft.com } POSTGRES_GITREF=${POSTGRES_GITREF:-REL_11_STABLE} CITUS_GITREF=${CITUS_GITREF:-master} diff --git a/valgrind/run-valgrind-tests b/valgrind/run-valgrind-tests index f329e66f..db956c11 100755 --- a/valgrind/run-valgrind-tests +++ b/valgrind/run-valgrind-tests @@ -2,7 +2,13 @@ set -euo pipefail -REPORT_EMAIL=${REPORT_EMAIL:-burak@citusdata.com metin@citusdata.com furkan@citusdata.com} +REPORT_EMAIL=${REPORT_EMAIL:-burak@citusdata.com \ + furkan@citusdata.com \ + metin@citusdata.com \ + Burak.Yucesoy@microsoft.com \ + Furkan.Sahin@microsoft.com \ + Hanefi.Onaldi@microsoft.com \ + Metin.Doslu@microsoft.com } CITUS_GITREF=${CITUS_GITREF:-master} POSTGRES_GITREF=${POSTGRES_GITREF:-REL_11_STABLE}