From 383ff771385b85a36078df90e08b832495daae8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Fri, 24 May 2019 13:59:10 -0700 Subject: [PATCH 1/6] Update key name in citus-style.cfg Rename align_number_left to align_number_right uncrustify renamed this key over a year ago https://github.com/uncrustify/uncrustify/pull/1393 --- uncrustify/citus-style.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 6e349b30cef19d8cf53c8bf857f20719363ccdde Mon Sep 17 00:00:00 2001 From: Hanefi Onaldi Date: Tue, 28 May 2019 13:26:46 +0300 Subject: [PATCH 2/6] Bump Homebrew formula --- HomebrewFormula/citustools.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HomebrewFormula/citustools.rb b/HomebrewFormula/citustools.rb index 9153a59d..d75db831 100644 --- a/HomebrewFormula/citustools.rb +++ b/HomebrewFormula/citustools.rb @@ -11,8 +11,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.7.7.tar.gz" - sha256 "5d3c29fb67575101c8b91c9bb4323d767646dae9f1a7fdc3d3a8871ff8401d81" + url "https://github.com/citusdata/tools/archive/v0.7.10.tar.gz" + sha256 "b16973b32c89be699e3f7924bc3afe04fe5d3c86407632d51b9e6ccf75a38f16" depends_on "uncrustify" depends_on Docker From be54e15ec0007940f2d39483efd68e153488a29b Mon Sep 17 00:00:00 2001 From: Hanefi Onaldi Date: Thu, 11 Jul 2019 19:16:09 +0300 Subject: [PATCH 3/6] Send emails to both citus and MS addresses --- valgrind/launch-test-instance | 8 +++++++- valgrind/run-valgrind-tests | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) 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} From f491cd932c7672362596c93a9a7b4cb929628199 Mon Sep 17 00:00:00 2001 From: Hanefi Onaldi Date: Tue, 30 Jul 2019 15:21:14 +0300 Subject: [PATCH 4/6] Update Alpine Dockerfile automatically --- automated_packaging/update_docker.pl | 4 ++++ 1 file changed, 4 insertions(+) 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`; From 6671b5ec77f5cb38d0a50171cce799cb70771086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Wed, 14 Aug 2019 18:22:19 +0000 Subject: [PATCH 5/6] citus_indent --diff: don't try parsing removed files --- uncrustify/citus_indent | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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"; } From ecf2ddf37f6c4bcfbf8aefc52a97b171c4988f8e Mon Sep 17 00:00:00 2001 From: Burak Yucesoy Date: Sun, 18 Aug 2019 17:57:50 +0300 Subject: [PATCH 6/6] Add CHANGELOG entry for version 0.7.11 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) 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