Merge 3fb957e into 1f61fac

.github/workflows/test.yml

@@ -9,12 +9,18 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os: ["ubuntu-latest"]
         julia-version: ['1.5', '1.4', '1.3', '1.2', '1.1', '1.0', 'nightly']
+        include:
+          - os: windows-latest
+            julia-version: 1
+          - os: windows-latest
+            julia-version: '1.0'
       fail-fast: false
-    name: Test Julia ${{ matrix.julia-version }}
+    name: Test Julia ${{ matrix.julia-version }} ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - name: Setup julia

src/project_toml_formatting.jl

@@ -46,7 +46,7 @@ function _analyze_project_toml_formatting_2(path::AbstractString, original)
 
     prj = TOML.parse(original)
     formatted = sprint(print_project, prj)
-    if original == formatted
+    if splitlines(original) == splitlines(formatted)
         LazyTestResult(
             label,
             "Running `Pkg.resolve` on `$(path)` did not change the content.",

src/utils.jl

@@ -2,6 +2,8 @@ if !@isdefined(isnothing)
     isnothing(x) = x === nothing
 end
 
+splitlines(str; kwargs...) = readlines(IOBuffer(str); kwargs...)
+
 askwargs(kwargs) = (; kwargs...)
 function askwargs(flag::Bool)
     if !flag

test/test_project_toml_formatting.jl

@@ -37,6 +37,16 @@ using Test
             """,
         ) ⊜ true
     end
+    @testset "pass: ignore carriage returns" begin
+        @test _analyze_project_toml_formatting_2(
+            path,
+            join([
+                """[deps]\r\n""",
+                """Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"\r\n""",
+                """Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"\r\n""",
+            ]),
+        ) ⊜ true
+    end
     @testset "failure: reversed deps" begin
         t = _analyze_project_toml_formatting_2(
             path,