Skip to content

Fix CI CMake formatting.#3278

Merged
ZedThree merged 4 commits intonextfrom
fix-CI-cmake-formatting
Feb 20, 2026
Merged

Fix CI CMake formatting.#3278
ZedThree merged 4 commits intonextfrom
fix-CI-cmake-formatting

Conversation

@oparry-ukaea
Copy link
Contributor

Add a missing in-place flag such that the CI CMake formatting step works as intended.

@oparry-ukaea
Copy link
Contributor Author

Ah - guess I need to exclude externalpackages?

dschwoerer
dschwoerer previously approved these changes Feb 18, 2026
@dschwoerer
Copy link
Contributor

Ah - guess I need to exclude externalpackages?

I do not think so. The cmake code for PVODE was done by @ZedThree

@oparry-ukaea
Copy link
Contributor Author

ok. I assume it will also modify externalpackages/fmt/CMakeLists.txt etc, but submodule changes don't get added.

@dschwoerer
Copy link
Contributor

I do not think they are checked out - and thus not modified.

@oparry-ukaea
Copy link
Contributor Author

Please feel free to merge if you're happy

@ZedThree
Copy link
Member

I'm definitely in favour of automatting the formatting, but please can we tweak the config before merging this? Currently it formats bout_add_example very badly:

bout_add_example(
  conduction-snb
  SOURCES
  conduction-snb.cxx
  EXTRA_FILES
  fit_temperature.py
  sinusoid.py
  snb.csv
  spitzer-harm.csv
  step.py
  temperature.csv
  vfp.csv
  DATA_DIRS
  data
  step)

It looks like there's support for custom commands that should make this nicer.

I also see there's a "dangle_parens" option that would be good to enable. This puts the closing bracket on a newline for multiline commands, which helps keep diffs small.

@dschwoerer
Copy link
Contributor

Looks good. Maybe you can rebase to remove the bot commits + force push? Then we do not have the bad formatting in the history.

Copy link
Member

@ZedThree ZedThree left a comment

Choose a reason for hiding this comment

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

There's some missing kwargs for the custom commands (you probably want to double check this config works though!)

@oparry-ukaea
Copy link
Contributor Author

Looks good. Maybe you can rebase to remove the bot commits + force push? Then we do not have the bad formatting in the history.

Will do - I'll make the changes that Peter suggested, then force push to get rid of the bot commits once we're happy that the templates are correct.

…le, bout_add_integrated_test, bout_add_mms_test, bout_handle_requires_conflicts more nicely.
@oparry-ukaea oparry-ukaea force-pushed the fix-CI-cmake-formatting branch from 6e22dac to 145cc25 Compare February 20, 2026 11:45
@oparry-ukaea
Copy link
Contributor Author

Made those template changes and disabled an option that seemed to be screwing up comments.

ZedThree
ZedThree previously approved these changes Feb 20, 2026
Copy link
Member

@ZedThree ZedThree left a comment

Choose a reason for hiding this comment

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

Lovely, thanks @oparry-ukaea!

@oparry-ukaea
Copy link
Contributor Author

👍 I'll force push once more to get rid of the bot commit.

@oparry-ukaea
Copy link
Contributor Author

Ready to merge.

@ZedThree ZedThree merged commit 0f749e0 into next Feb 20, 2026
8 of 26 checks passed
@ZedThree ZedThree deleted the fix-CI-cmake-formatting branch February 20, 2026 13:09
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.

3 participants