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

Disable EOL Conversion On /.jvmopts #1170

Merged

Conversation

@isomarcte
Copy link
Contributor

isomarcte commented Dec 8, 2019

Add a .gitattributes file to prevent end of line (EOL) conversion on the /.jvmopts file. This was the causing windows based CI failures as the JVM options were being parsed with a carriage return at the end of them.

This commit also re-enables use of the .jvmopts file in the Windows CI environment.


Add a `.gitattributes` file to prevent end of line (EOL) conversion on the `/.jvmopts` file. This was the causing windows based CI failures as the JVM options were being parsed with a carriage return at the end of them.

This commit also re-enables use of the `.jvmopts` file in the Windows CI environment.
@isomarcte isomarcte mentioned this pull request Dec 8, 2019
@gabro

This comment has been minimized.

Copy link
Member

gabro commented Dec 8, 2019

Thanks for following up! Would you mind adding a comment explaining that we do this because sbt-extras requires LF even on Windows?

@gabro
gabro approved these changes Dec 8, 2019
Copy link
Member

gabro left a comment

Thanks a lot! This was driving me crazy 😄

Copy link
Member

olafurpg left a comment

Awesome! Thank you so much 😊

@olafurpg

This comment has been minimized.

Copy link
Member

olafurpg commented Dec 8, 2019

The windows failure looks unrelated to this PR


[error occurred during error reporting (null), id 0xc0000005]

#
# There is insufficient memory for the Java Runtime Environment to continue.
# Native memory allocation (malloc) failed to allocate 1114736 bytes for Chunk::new
# An error report file with more information is saved as:
# D:\a\metals\metals\tests\unit\hs_err_pid2276.log

I suspect we need to drop the -Xmx4G line from .jvmopts

@olafurpg olafurpg merged commit f15d7b4 into scalameta:master Dec 8, 2019
10 of 11 checks passed
10 of 11 checks passed
ubuntu-latest tests
Details
windows-latest tests windows-latest tests
Details
macOS-latest tests
Details
Sbt integration
Details
Maven integration
Details
Gradle integration
Details
Mill integration
Details
Pants integration
Details
Slow tests
Details
Scala cross tests
Details
Scalafmt/Scalacheck/Docs
Details
@isomarcte isomarcte deleted the isomarcte:fix-windows-ci-eol-conversions branch Dec 8, 2019
@isomarcte

This comment has been minimized.

Copy link
Contributor Author

isomarcte commented Dec 8, 2019

Thanks for following up! Would you mind adding a comment explaining that we do this because sbt-extras requires LF even on Windows?

@gabro sorry I didn't see this until just now. Do you want me to add a comment still? To be clear, it isn't really a sbt-extras problem, it's more of a bash problem with how it splits a file on \n when parsing in that function.

@gabro

This comment has been minimized.

Copy link
Member

gabro commented Dec 9, 2019

that’s fine, I just wanted to provide some context, but this PR is easily searchable anyway. Thanks again

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.