Merge pull request #10 from dorssel/test_analytics

Migrate to Codecov test analytics
dorssel · Dec 24, 2024 · 5e48e1b · 5e48e1b
2 parents d346a2f + cf7970b
commit 5e48e1b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -8,6 +8,13 @@
         "dotnet-gitversion"
       ],
       "rollForward": false
+    },
+    "trx2junit": {
+      "version": "2.1.0",
+      "commands": [
+        "trx2junit"
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -40,8 +40,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          dotnet restore
           dotnet tool restore
+          dotnet restore
 
       - name: Build
         run: |
@@ -57,13 +57,6 @@ jobs:
       - name: Package
         run: dotnet pack --configuration Release --no-build
 
-      - name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        if: always()
-        with:
-          files: |
-            **/TestResults/*.trx
-
       - name: Upload Package Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -73,7 +66,21 @@ jobs:
             **/*.snupkg
             retention-days: 14
 
-      - name: Codecov
+      - name: Convert test results
+        if: ${{ !cancelled() }}
+        run: |
+          find . -name "*.trx" -exec dotnet tool run trx2junit --output TestResults/JUnit {} +
+
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          fail_ci_if_error: true
+          files: TestResults/JUnit/*.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
         with:
+          fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -29,13 +29,13 @@ SPDX-License-Identifier: MIT
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     <InvariantGlobalization>true</InvariantGlobalization>
+    <SatelliteResourceLanguages>en-US</SatelliteResourceLanguages>
     <SelfContained>false</SelfContained>
     <IsPackable>false</IsPackable>
     <IsPublishable>false</IsPublishable>
     <IsTrimmable>true</IsTrimmable>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\strongname.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>CS1591</NoWarn>
 
     <!-- Assembly metadata -->
     <Product>gitversion-msbuild</Product>

diff --git a/GitVersion.MsBuild/GitVersion.MsBuild.csproj b/GitVersion.MsBuild/GitVersion.MsBuild.csproj
@@ -16,7 +16,7 @@ SPDX-License-Identifier: MIT
     <IsPackable>true</IsPackable>
     <BuildOutputTargetFolder>tools</BuildOutputTargetFolder>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-    <NoWarn>NU5128;$(NoWarn)</NoWarn>
+    <NoWarn>$(NoWarn);CS1591;NU5128</NoWarn>
     <PackageId>Dorssel.GitVersion.MsBuild</PackageId>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>