More osx tweaks

gui-cs · Jul 7, 2024 · 1a53cd0 · 1a53cd0
1 parent 2d3d784
commit 1a53cd0
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -38,21 +38,24 @@ jobs:
     - name: Build Debug
       run: dotnet build --configuration Debug --no-restore
 
-    - name: Install sed on macOS
+    - name: Install sed on macOS and update xunit.runner.json
       if: runner.os == 'macOS'
       run: |
           brew install gnu-sed
           PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
-          sed --version
+          sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json
+
+    - name: Update xunit.runner.json (Windows/Ubuntu)
+      if: runner.os != 'macOS'
+      run: |
+          sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json
 
       # See https://github.com/microsoft/vstest/issues/2952 for why the --blame stuff below is needed.
       # Without it, the test runner crashes on ubuntu (but not Windows)/
     - name: Test
       run: |
-        PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
-        sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json
         dotnet test --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings --diag:logs/logs.txt --blame --blame-crash --blame-hang --blame-hang-timeout 60s --blame-crash-collect-always 
-       
+     
         # mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/
 
     - name: Upload Test Logs
@@ -62,7 +65,6 @@ jobs:
         name: test-logs
         path: |
           logs/    
-          uploads/
           UnitTests/TestResults/
   
     # Note: this step is currently not writing to the gist for some reason