Disable EOL Conversion On /.jvmopts

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.
scalameta · Dec 8, 2019 · 1ecb632 · 1ecb632
1 parent 9533e87
commit 1ecb632
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/.jvmopts eol=lf
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,14 +12,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-    env:
-      JAVA_OPTS: -Xss4m -Xms1G -Xmx8G -XX:ReservedCodeCacheSize=1024m -XX:+TieredCompilation -XX:+CMSClassUnloadingEnabled -Dfile.encoding=UTF-8 -Djna.nosys=true
     steps:
       - uses: actions/checkout@v1
       - uses: olafurpg/setup-scala@v7
       - name: Run unit tests
         run: |
-          rm .jvmopts
           bin/test.sh unit/test
         shell: bash
   sbt: