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

fix: enforce unix-style newlines through .gitattributes #377

Merged
merged 1 commit into from
Oct 12, 2022

Conversation

ShootingKing-AM
Copy link
Contributor

  • Is recommended by Prettier itself - https://prettier.io/docs/en/options.html#end-of-line
  • If this not set, git itself converts the EOLs(by default, to OS specifc EOLs), when code is pulled from repo, so Windows devs will by default will have CRLF files in their working directory
  • git will also recognize its own auto-eol-conversions (normalization) as code changes - polluting commit changes
  • When comitting code EOLs which is inconflict with .editerconfig or .prettier.yml, which will cause issues in CI as well as local build warns

Ref:

- Is recommended by Prettier itself - https://prettier.io/docs/en/options.html#end-of-line
- If this not set, git itself converts the EOLs when code is pulled from repo - so Windows users will by default will have CRLF as EOLs which is inconflict with .editerconfig or .prettier.yml, which will cause issues in CI aswell as local build warns
@codecov
Copy link

codecov bot commented Oct 12, 2022

Codecov Report

Base: 25.58% // Head: 25.58% // No change to project coverage 👍

Coverage data is based on head (d402698) compared to base (238a229).
Patch has no changes to coverable lines.

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #377   +/-   ##
=======================================
  Coverage   25.58%   25.58%           
=======================================
  Files          26       26           
  Lines        1442     1442           
  Branches      223      223           
=======================================
  Hits          369      369           
  Misses       1044     1044           
  Partials       29       29           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@ErikBjare
Copy link
Member

Nice!

Thanks for the links, learned something new today :)

@ErikBjare ErikBjare changed the title fix: Unintentional EOL prettier warns/errors in CI and Local fix: enforce unix-style newlines through .gitattributes Oct 12, 2022
@ErikBjare ErikBjare merged commit 4a6de2f into ActivityWatch:master Oct 12, 2022
@ShootingKing-AM ShootingKing-AM deleted the fix-eol branch October 12, 2022 20:23
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.

2 participants