Hi all,
Once this MR lands, VTK’s CI will be using Xcode 15.4. Due to Apple macOS/Xcode compatibility alignments and some reinstallations to resolve odd errors on some CI machines (which updated to the latest macOS version in the process), there was a gulf between machines which could run Xcode 14.2 (what is used today) and Xcode 15.4 (what we’re migrating to). This has resulted in a shortage in available resources to work on macOS jobs. With this MR, we’ll be able to update the remaining machines to also offer Xcode 15.4, but all open MRs will need a rebase in order to use the new CI configuration.
Additionally, there is an MR to update our clang-format
configuration to prepare for C++17 (in the post-9.4 cycle) by telling it VTK is “using” C++17 (from a syntax point of view). This is best done now, before branching, so that backporting to 9.4 does not involve lots of conflicts between 9.4 and master
.
When resolving conflicts with any formatting issues, feel free to take “your” side unconditionally; the robot’s Do: reformat
will resolve any reformatting changes necessary for your code. Note that there may be conflicts with master
other than reformatting, so please be sure to look for those. This can be resolved by rebasing twice: once on the master
commit before reformatting lands (fix these as normal) and then again on the reformatting merge commit itself (take your changes here).
I’ll try to get the reformatting merged shortly after the Xcode update is merged so that everyone only needs to rebase once. Luckily it’s a weekend .
–Ben