Strips trailing carriage return characters from input lines.

babelfish-for-postgresql · Feb 12, 2025 · 2002e34 · 2002e34
1 parent 450d22b
commit 2002e34
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/.github/workflows/dotnet-tests.yml b/.github/workflows/dotnet-tests.yml
@@ -50,14 +50,6 @@ jobs:
         if: always() && steps.install-extensions.outcome == 'success'
         uses: ./.github/composite-actions/install-and-run-dotnet
 
-      - name: Upload upgrade Log
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: dotnet-output
-          path: |
-            test/dotnet/Output/*
-
       - name: Generate Code Coverage
         id: generate-code-coverage
         if: always() && steps.run-dotnet-tests.outcome == 'success'

diff --git a/test/dotnet/utils/TestUtils.cs b/test/dotnet/utils/TestUtils.cs
@@ -471,15 +471,15 @@ ProcessStartInfo GetDiffFileProcessDependingOnOs(string output, string expectedO
                 return new  ProcessStartInfo
                 {
                     FileName = @"powershell.exe",
-                    Arguments = $"-c \"diff -u -a (cat {output}) (cat {expectedOutput}) > {diffFile}\"",
+                    Arguments = $"-c \"diff -u --strip-trailing-cr (cat {output}) (cat {expectedOutput}) > {diffFile}\"",
                     UseShellExecute = false,
                     CreateNoWindow = false,
                     RedirectStandardError = true
                 };
             return new  ProcessStartInfo
             {
                 FileName = @"bash",
-                Arguments = $"-c \"diff -u -a {output} {expectedOutput} > {diffFile}\"",
+                Arguments = $"-c \"diff -u --strip-trailing-cr {output} {expectedOutput} > {diffFile}\"",
                 UseShellExecute = false,
                 CreateNoWindow = false,
                 RedirectStandardError = true