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

Run dos2unix #6198

Merged
merged 2 commits into from
Dec 14, 2021
Merged

Run dos2unix #6198

merged 2 commits into from
Dec 14, 2021

Conversation

rdrpenguin04
Copy link
Contributor

Every CRLF line ending in the main repo should now be replaced with LF. I tried to only touch text files, but it's possible something slipped through the cracks.

Let me know if you have any questions!

@TechnoPorg
Copy link
Contributor

This seems like a good opportunity to add CRLF fixing to .gitattributes as well, so that dos2unix won't have to be run again. I found a good article on the subject here: https://www.aleksandrhovhannisyan.com/blog/crlf-vs-lf-normalizing-line-endings-in-git/. Besides that, this looks fine to me!

@rdrpenguin04
Copy link
Contributor Author

Thank you for the article! .gitattributes has been updated.

@LmmsBot
Copy link

LmmsBot commented Oct 18, 2021

🤖 Hey, I'm @LmmsBot from github.com/lmms/bot and I made downloads for this pull request, click me to make them magically appear! 🎩

Windows

macOS

Linux

🤖
{"platform_name_to_artifacts": {"Windows": [{"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://15128-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.147%2Bgf9dce33d9-mingw-win64.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/15128?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://15129-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.147%2Bgf9dce33d9-mingw-win32.exe"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/15129?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}, {"artifact": {"title": {"title": "32-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/hjqt938u8aot0uwj/artifacts/build/lmms-1.3.0-alpha-msvc2017-win32.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/41184238"}, {"artifact": {"title": {"title": "64-bit", "platform_name": "Windows"}, "link": {"link": "https://ci.appveyor.com/api/buildjobs/b30m6fx7f7cwj6hq/artifacts/build/lmms-1.3.0-alpha-msvc2017-win64.exe"}}, "build_link": "https://ci.appveyor.com/project/Lukas-W/lmms/builds/41184238"}], "macOS": [{"artifact": {"title": {"title": "", "platform_name": "macOS"}, "link": {"link": "https://15126-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.147%2Bgf9dce33d9-mac10.14.dmg"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/15126?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}], "Linux": [{"artifact": {"title": {"title": "(AppImage)", "platform_name": "Linux"}, "link": {"link": "https://15125-15778896-gh.circle-artifacts.com/0/lmms-1.3.0-alpha.1.147%2Bgf9dce33d9-linux-x86_64.AppImage"}}, "build_link": "https://circleci.com/gh/LMMS/lmms/15125?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link"}]}, "commit_sha": "54cf4dd40b27fc3f0572046b5df92655ce20018e"}

Copy link
Contributor

@TechnoPorg TechnoPorg left a comment

Choose a reason for hiding this comment

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

This looks good to me!

@rdrpenguin04
Copy link
Contributor Author

I just got around to testing the modified .ds and .xiz file(s); they work! If anyone else has edge cases to test, feel free; I think this should be set though.

@superpaik
Copy link
Contributor

Interfase works well, instrument presets work well, midi import/export as well. Tested on W10.

@JohannesLorenz
Copy link
Contributor

@rdrpenguin04 I'll merge this now. Want squash or rebase+ff?

@rdrpenguin04
Copy link
Contributor Author

Probably squash

@JohannesLorenz JohannesLorenz merged commit 7e2ccc1 into LMMS:master Dec 14, 2021
@tresf
Copy link
Member

tresf commented Dec 17, 2021

This seems like a good opportunity to add CRLF fixing to .gitattributes as well, so that dos2unix won't have to be run again. I found a good article on the subject here: https://www.aleksandrhovhannisyan.com/blog/crlf-vs-lf-normalizing-line-endings-in-git/. Besides that, this looks fine to me!

Late to this PR, but @TechnoPorg thanks for this insight, it's helped me on another project as well. 👌

@rdrpenguin04 rdrpenguin04 deleted the dos2unix branch January 31, 2022 04:01
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.

6 participants