Skip to content

Upgrade uncrustify from 0.68.1 to 0.82.0#8373

Merged
naisila merged 5 commits into
mainfrom
naisila/upgrade-uncrustify
Dec 11, 2025
Merged

Upgrade uncrustify from 0.68.1 to 0.82.0#8373
naisila merged 5 commits into
mainfrom
naisila/upgrade-uncrustify

Conversation

@naisila
Copy link
Copy Markdown
Contributor

@naisila naisila commented Dec 7, 2025

This upgrade has changed some indentation levels, moved some commas/semicolons to new lines, etc.
I also did some manual style changes to obey the 88-90 character per line rule and avoid commas or semicolons in a new line

Sister PRs citusdata/tools#382 citusdata/the-process#179

@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 7, 2025

Codecov Report

❌ Patch coverage is 84.00000% with 12 lines in your changes missing coverage. Please review.
✅ Project coverage is 88.94%. Comparing base (b68023f) to head (9c70ad0).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8373      +/-   ##
==========================================
- Coverage   88.94%   88.94%   -0.01%     
==========================================
  Files         287      287              
  Lines       63150    63154       +4     
  Branches     7938     7938              
==========================================
+ Hits        56171    56174       +3     
+ Misses       4669     4668       -1     
- Partials     2310     2312       +2     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@naisila naisila force-pushed the naisila/upgrade-uncrustify branch 4 times, most recently from 3d5c3fb to fcf9d2d Compare December 8, 2025 18:31
@naisila naisila marked this pull request as ready for review December 8, 2025 18:49
naisila added a commit to citusdata/the-process that referenced this pull request Dec 11, 2025
Upgrades uncrustify to 0.82.0 (see below), downgrades pg versions since
we will bump versions in Citus _after_ we fix style images.

Getting the following error with uncrustify 0.68.1:
```
+ cmake ..
CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
Compatibility with CMake < 3.5 has been removed from CMake.
```
Fix:
0.78.0 is the oldest version with cmake_minimum_required(VERSION 3.5).
However, I suggest going with the newest version of uncrustify, 0.82.0,
since were gonna update all things anyway, might as well use the newest
version.

Sister PRs citusdata/citus#8373
citusdata/tools#382
@naisila naisila force-pushed the naisila/upgrade-uncrustify branch 2 times, most recently from f808d8e to 477bfce Compare December 11, 2025 11:32
@naisila naisila force-pushed the naisila/upgrade-uncrustify branch from 477bfce to 9c70ad0 Compare December 11, 2025 11:35
@naisila naisila requested a review from eaydingol December 11, 2025 11:35
@naisila naisila changed the title Upgrade uncrustify to from 0.68.1 to 0.82.0 Upgrade uncrustify from 0.68.1 to 0.82.0 Dec 11, 2025
originalQuery,
PlannerRestrictionContext
*
plannerRestrictionContext,
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

auto change, but does not look better

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree 😄
So, the indentation right below the opening bracket of the function is something new from uncrustify, couldn't change that.
The star (*) on its own line was there before as well, couldn't find a way to get rid of it.

Copy link
Copy Markdown
Collaborator

@eaydingol eaydingol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
thanks for the effort you put into the version update and the manual fixes!

@naisila naisila merged commit 75460fa into main Dec 11, 2025
123 checks passed
@naisila naisila deleted the naisila/upgrade-uncrustify branch December 11, 2025 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants