-
Notifications
You must be signed in to change notification settings - Fork 92
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
base: core4
Are you sure you want to change the base?
Update dockerfiles #701
Conversation
thatnerdjosh
commented
Jan 29, 2024
•
edited
Loading
edited
- Convert line endings for some files
- Install newer CMake as per CMakeList requirements.
- Update repository reference
- Migrate from deprecated MAINTAINER command.
- Add insert_final_newline
- Add end_of_line setting
3f5f272
to
3913aba
Compare
@@ -1,6 +1,10 @@ | |||
; Top-most EditorConfig file | |||
root = true | |||
|
|||
[*] | |||
insert_final_newline = true | |||
end_of_line = lf |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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