From e9824f7c0a062d4d0072254195572d883a7e8afa Mon Sep 17 00:00:00 2001 From: naisila Date: Mon, 8 Dec 2025 20:24:15 +0300 Subject: [PATCH] Upgrade uncrustify to 0.82.0 --- .devcontainer/Dockerfile | 6 +++--- .github/workflows/build_and_test.yml | 4 ++-- STYLEGUIDE.md | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6579c52d9..73a5ba0aa 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -113,10 +113,10 @@ FROM base AS uncrustify-builder RUN sudo apt update && sudo apt install -y cmake tree WORKDIR /uncrustify -RUN curl -L https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.tar.gz | tar xz -WORKDIR /uncrustify/uncrustify-uncrustify-0.68.1/ +RUN curl -L https://github.com/uncrustify/uncrustify/archive/uncrustify-0.82.0.tar.gz | tar xz +WORKDIR /uncrustify/uncrustify-uncrustify-0.82.0/ RUN mkdir build -WORKDIR /uncrustify/uncrustify-uncrustify-0.68.1/build/ +WORKDIR /uncrustify/uncrustify-uncrustify-0.82.0/build/ RUN cmake .. RUN MAKEFLAGS="-j $(nproc)" make -s diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 98e012179..063a95643 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -30,9 +30,9 @@ jobs: fail_test_image_name: "ghcr.io/citusdata/failtester" pgupgrade_image_name: "ghcr.io/citusdata/pgupgradetester" style_checker_image_name: "ghcr.io/citusdata/stylechecker" - style_checker_tools_version: "0.8.18" + style_checker_tools_version: "test" sql_snapshot_pg_version: "17.6" - image_suffix: "-va20872f" + image_suffix: "-dev-57f9967" pg15_version: '{ "major": "15", "full": "15.14" }' pg16_version: '{ "major": "16", "full": "16.10" }' pg17_version: '{ "major": "17", "full": "17.6" }' diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md index b4eec23b0..e4f511af3 100644 --- a/STYLEGUIDE.md +++ b/STYLEGUIDE.md @@ -11,9 +11,9 @@ tool. This tool uses `uncrustify` under the hood. ```bash # Uncrustify changes the way it formats code every release a bit. To make sure -# everyone formats consistently we use version 0.68.1: -curl -L https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.tar.gz | tar xz -cd uncrustify-uncrustify-0.68.1/ +# everyone formats consistently we use version 0.82.0: +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 ..