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 dockerfiles #701

Open
wants to merge 6 commits into
base: core4
Choose a base branch
from

Conversation

@thatnerdjosh thatnerdjosh force-pushed the support/update_dockerfiles branch from 3f5f272 to 3913aba Compare January 29, 2024 11:01
@@ -1,6 +1,10 @@
; Top-most EditorConfig file
root = true

[*]
insert_final_newline = true
end_of_line = lf
Copy link
Member

Choose a reason for hiding this comment

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

All our line endings are set to platform native in git configuration.

Copy link
Contributor Author

@thatnerdjosh thatnerdjosh Jan 31, 2024

Choose a reason for hiding this comment

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

Ok - the issue I was having is most files were checked in LF, but there were some files which were CRLF in the repo, which caused the branch to be dirty immediately on checkout. Do you have a solution for this?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, they should be in LF in the repo, so committing the LF files is the correct fix for that. Just local storage should be in native.

See https://github.com/ryzom/ryzomcore/blob/core4/.gitattributes

Copy link
Member

Choose a reason for hiding this comment

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

Those defective files might've been committed before the .gitattributes was cleaned up.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Amazing - I'll remove this editorconfig change then as it's not necessary

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants