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

added CAM to precommit #14063

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Conversation

sliptonic
Copy link
Member

No description provided.

@github-actions github-actions bot added the WB CAM Related to the CAM/Path Workbench label May 16, 2024
@chennes
Copy link
Member

chennes commented May 17, 2024

You need to either run pre-commit manually on all your files, or allow maintainers to edit your PR so the CI does it for you. Ping me if you need help running manually.

@adrianinsaval
Copy link
Member

is it supposed to touch .ts files?

@sliptonic
Copy link
Member Author

This file is causing me some headache: /src/Mod/CAM/libarea/kurve/geometry.h

I run the pre-commit locally and it modifies many files including geometry.h
I stage all the changed files to a commit and try to commit. I get this message from precommit:

trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...........................................(no files to check)Skipped
check for added large files..............................................Passed
mixed line ending........................................................Passed
black................................................(no files to check)Skipped
clang-format.............................................................Failed
- hook id: clang-format
- files were modified by this hook

I rescan and that file has been changed again but the diff appears the same.

I add it to the staged files and try again. Same error. The file has changed again and it's the same diff again.

If I try committing without that file I get this error

[WARNING] Unstaged files detected.
[INFO] Stashing unstaged files to /home/brad/.cache/pre-commit/patch1715963902-219549.
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...........................................(no files to check)Skipped
check for added large files..............................................Passed
mixed line ending........................................................Passed
black................................................(no files to check)Skipped
clang-format.............................................................Failed

  • hook id: clang-format
  • files were modified by this hook
    [WARNING] Stashed changes conflicted with hook auto-fixes... Rolling back fixes...
    [INFO] Restored changes from /home/brad/.cache/pre-commit/patch1715963902-219549.

@sliptonic
Copy link
Member Author

FWIW, the diff is strange too.
image

@sliptonic
Copy link
Member Author

still working on it

@chennes chennes self-assigned this Jun 3, 2024
@sliptonic
Copy link
Member Author

Will try on another machine

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WB CAM Related to the CAM/Path Workbench
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants