From 7ba2db1f68d1bc6be81274c5a6ba1ceb8ab38920 Mon Sep 17 00:00:00 2001 From: naisila Date: Sun, 7 Dec 2025 23:38:49 +0300 Subject: [PATCH 1/3] Upgrade uncrustify, and lower pg versions --- circleci/images/PG_VERSIONS | 6 +++--- circleci/images/stylechecker/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/circleci/images/PG_VERSIONS b/circleci/images/PG_VERSIONS index f31c553..5d2c6c9 100644 --- a/circleci/images/PG_VERSIONS +++ b/circleci/images/PG_VERSIONS @@ -1,3 +1,3 @@ -PG15=15.15 -PG16=16.11 -PG17=17.7 +PG15=15.14 +PG16=16.10 +PG17=17.6 diff --git a/circleci/images/stylechecker/Dockerfile b/circleci/images/stylechecker/Dockerfile index 23d3507..e6db9c8 100644 --- a/circleci/images/stylechecker/Dockerfile +++ b/circleci/images/stylechecker/Dockerfile @@ -36,15 +36,15 @@ make uncrustify/.install cd .. rm -rf "v${TOOLS_VERSION}.tar.gz" -curl -L "https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.tar.gz" | tar xz -cd uncrustify-uncrustify-0.68.1/ +curl -L "https://github.com/uncrustify/uncrustify/archive/uncrustify-0.82.0.tar.gz" | tar xz +cd uncrustify-uncrustify-0.82.0/ mkdir build cd build cmake .. make -j5 make install cd ../.. -rm -rf uncrustify-uncrustify-0.68.1/ +rm -rf uncrustify-uncrustify-0.82.0/ # this image is only used for testing purposes, so should be okay to overwrite system-managed packages pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages From 57f9967b64b936b8df50ff20d7f2402ac5603be1 Mon Sep 17 00:00:00 2001 From: naisila Date: Mon, 8 Dec 2025 20:08:58 +0300 Subject: [PATCH 2/3] Try test tag in citus tools --- circleci/images/Makefile | 2 +- circleci/images/stylechecker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/circleci/images/Makefile b/circleci/images/Makefile index 52be4ca..a712fb6 100644 --- a/circleci/images/Makefile +++ b/circleci/images/Makefile @@ -14,7 +14,7 @@ PG_VERSIONS=$(shell cat PG_VERSIONS|cut -c 6-|tr '\n' ' ' ) PG_UPGRADE_TESTER_VERSION=$(shell echo ${PG_VERSIONS}|tr ' ' '-'|sed 's/~//g') -STYLE_CHECKER_TOOLS_VERSION=0.8.18 +STYLE_CHECKER_TOOLS_VERSION=test # Upgrade tests for the PG major versions from PG_VERSIONS file CITUS_UPGRADE_PG_VERSIONS=$(shell head PG_VERSIONS|cut -c 6-|tr '\n' ' ') diff --git a/circleci/images/stylechecker/Dockerfile b/circleci/images/stylechecker/Dockerfile index e6db9c8..78fb346 100644 --- a/circleci/images/stylechecker/Dockerfile +++ b/circleci/images/stylechecker/Dockerfile @@ -31,7 +31,7 @@ apk add --no-cache \ py3-packaging \ curl -L "https://github.com/citusdata/tools/archive/v${TOOLS_VERSION}.tar.gz" | tar xz -cd "tools-${TOOLS_VERSION}" +cd "tools-v${TOOLS_VERSION}" make uncrustify/.install cd .. rm -rf "v${TOOLS_VERSION}.tar.gz" From 2275a64978d07ed1d56e684375c1ef8b5f1dcc07 Mon Sep 17 00:00:00 2001 From: naisila Date: Thu, 11 Dec 2025 11:54:03 +0300 Subject: [PATCH 3/3] Use v0.8.33 tag of tools repo --- circleci/images/Makefile | 2 +- circleci/images/stylechecker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/circleci/images/Makefile b/circleci/images/Makefile index a712fb6..32d78ed 100644 --- a/circleci/images/Makefile +++ b/circleci/images/Makefile @@ -14,7 +14,7 @@ PG_VERSIONS=$(shell cat PG_VERSIONS|cut -c 6-|tr '\n' ' ' ) PG_UPGRADE_TESTER_VERSION=$(shell echo ${PG_VERSIONS}|tr ' ' '-'|sed 's/~//g') -STYLE_CHECKER_TOOLS_VERSION=test +STYLE_CHECKER_TOOLS_VERSION=0.8.33 # Upgrade tests for the PG major versions from PG_VERSIONS file CITUS_UPGRADE_PG_VERSIONS=$(shell head PG_VERSIONS|cut -c 6-|tr '\n' ' ') diff --git a/circleci/images/stylechecker/Dockerfile b/circleci/images/stylechecker/Dockerfile index 78fb346..e6db9c8 100644 --- a/circleci/images/stylechecker/Dockerfile +++ b/circleci/images/stylechecker/Dockerfile @@ -31,7 +31,7 @@ apk add --no-cache \ py3-packaging \ curl -L "https://github.com/citusdata/tools/archive/v${TOOLS_VERSION}.tar.gz" | tar xz -cd "tools-v${TOOLS_VERSION}" +cd "tools-${TOOLS_VERSION}" make uncrustify/.install cd .. rm -rf "v${TOOLS_VERSION}.tar.gz"