Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Register
  • Sign in
  • NetworkManager NetworkManager
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Issues 194
    • Issues 194
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 23
    • Merge requests 23
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • NetworkManagerNetworkManager
  • NetworkManagerNetworkManager
  • Merge requests
  • !1463

[th/update-to-fedora37] update gitlab-ci to Fedora 37 and update used clang-format-version + reformat

  • Review changes

  • Download
  • Patches
  • Plain diff
Closed Thomas Haller requested to merge th/update-to-fedora37 into main Nov 19, 2022
  • Overview 5
  • Commits 4
  • Pipelines 2
  • Changes 32

as time goes by, new Fedora releases happen. Now Fedora 37 is out.

In our gitlab-ci we have various distros, but one of them is special because:

  • it always runs (most others need to be triggered manually)
  • it builds our pages/documentation, like https://networkmanager.pages.freedesktop.org/NetworkManager/NetworkManager/NetworkManager.html
  • it is the base for the check-tree and check-patch steps.

Update that image from F36 to F37.


Also, this must agree with the used clang-format version. Unfortunately, the output of clang-format depends on its version, so we must all agree to use the same version. So far, the version was the one from Fedora 36.

As we update the base image for the check-tree step, it uses now clang-format 15.0.4-1.fc37. We need to account for that.

It's also, that by now the majority of the code developers switched to Fedora 37 too. So additionally, we want that on the developer machine (which now happens to be Fedora 37) ./contrib/scripts/nm-code-format.sh does the right thing.

This also requires reformatting the entire source tree with the new clang-format. Fortunately, the difference is small:

28 files changed, 128 insertions(+), 126 deletions(-)

Theoretically, the same what is said about clang-format also applies to python-black. Fortunately, the new black version behaves just the same as the previous one, so nobody needs to care about the difference. In the past that was not always the case. Black seems more stable and it probably has an easier job formatting Python (Python maybe having a simpler style and black being opinionated to follow PEP8 -- meaning, it's almost not configurable). Hopefully, one day clang-format will be as stable and newer versions don't change behavior. So far, this is a repeating annoyance.

Edited Nov 19, 2022 by Thomas Haller
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: th/update-to-fedora37