Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update clang-format to 17.0.3 and port clang-format actions from obs-studio #457

Merged
merged 7 commits into from
Oct 17, 2024

Conversation

RytoEX
Copy link
Member

@RytoEX RytoEX commented Oct 11, 2024

Description

This PR does a few things:

  1. Port the clang-format Github Actions and Workflow from the obs-studio repo
  2. Port the .clang-format file/settings from the obs-studio repo
  3. Applies clang-format changes from clang-format 17 and the new .clang-format settings

Some of these commits can and probably should be squashed so that there is not a commit that would fail CI. Alternatively, we rearrange the commits so that the old workflow is removed first, and then the files are formatted, and then new workflow is added to validate.

Motivation and Context

Have been wanting to do this for a while for consistency and finally get obs-browser off of clang-format 13.0.1.

How Has This Been Tested?

Ran clang-format locally. Will see if CI passes.

Types of changes

  • Code cleanup (non-breaking change which makes code smaller or more readable)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@RytoEX RytoEX self-assigned this Oct 11, 2024
@RytoEX RytoEX force-pushed the update-clang-format-actions branch 3 times, most recently from 20cb32a to 0eac1eb Compare October 11, 2024 19:23
Copy link
Member

@WizardCM WizardCM left a comment

Choose a reason for hiding this comment

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

The output of this PR matches what I expected when I originally performed formatting with the wider column layout.

@WizardCM
Copy link
Member

I've rebased this PR to ensure it still passes with the other changes to master. Will leave up to @RytoEX to squash as necessary & merge.

After this PR is merged, it'd also be worth committing a .git-blame-ignore-revs with commits from this PR and my original one.

RytoEX and others added 7 commits October 15, 2024 17:28
Co-authored-by: PatTheMav <PatTheMav@users.noreply.github.com>
This is so we can update clang-format to 17 or newer.

Co-authored-by: PatTheMav <PatTheMav@users.noreply.github.com>
Co-authored-by: PatTheMav <PatTheMav@users.noreply.github.com>
Also port clang-format settings from obs-studio. Use these settings for
consistency with obs-studio code style.
@RytoEX RytoEX force-pushed the update-clang-format-actions branch from 9d46dce to 9ab4e77 Compare October 15, 2024 21:30
@RytoEX RytoEX merged commit 941c48b into obsproject:master Oct 17, 2024
1 check passed
@RytoEX RytoEX deleted the update-clang-format-actions branch October 17, 2024 19:14
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