Skip to content

Upgrade uncrustify to fix stylechecker images #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naisila merged 3 commits into from
Dec 11, 2025
Merged

Upgrade uncrustify to fix stylechecker images #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ba2db1
Upgrade uncrustify, and lower pg versions
naisila Dec 7, 2025
57f9967
Try test tag in citus tools
naisila Dec 8, 2025
2275a64
Use v0.8.33 tag of tools repo
naisila Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion circleci/images/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=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' ' ')
Expand Down
6 changes: 3 additions & 3 deletions circleci/images/PG_VERSIONS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PG15=15.15
PG16=16.11
PG17=17.7
PG15=15.14
PG16=16.10
PG17=17.6
6 changes: 3 additions & 3 deletions circleci/images/stylechecker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down