Fix TRX file generation to prevent nested directories and upload failures (#722)

* Initial plan

* Initial analysis of TRX file generation issue

Co-authored-by: pardeike <[email protected]>

* Fix TRX file generation to prevent nested directories and duplicates

Co-authored-by: pardeike <[email protected]>

* Clean up test files and finalize TRX generation fix

Co-authored-by: pardeike <[email protected]>

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: pardeike <[email protected]>

Author: Copilot

.github/actions/test-execute-test/action.yml

@@ -90,7 +90,7 @@ runs:
     
         foreach ($target_framework in ConvertFrom-Json "${{steps.test-args.outputs.target_frameworks}}") {
           $trxFileName = "${{inputs.os}}-${{inputs.architecture}}-${{inputs.runtime-type}}-${{inputs.build_configuration}}-$target_framework.trx"
-          & ${{(inputs.runtime-type == 'mono' && '"$mono"') || ''}} "$vstest" "HarmonyTests/bin/${{inputs.build_configuration}}/$target_framework/HarmonyTests.dll" --framework:$target_framework --logger:"trx;LogFileName=TestResults/$trxFileName" --logger:"console;verbosity=normal" --blame -- ${{steps.test-args.outputs.run_settings_args}}
+          & ${{(inputs.runtime-type == 'mono' && '"$mono"') || ''}} "$vstest" "HarmonyTests/bin/${{inputs.build_configuration}}/$target_framework/HarmonyTests.dll" --framework:$target_framework --logger:"trx;LogFileName=../TestResults/$trxFileName" --logger:"console;verbosity=normal" --blame -- ${{steps.test-args.outputs.run_settings_args}}
         }
       shell: pwsh
 
@@ -99,7 +99,7 @@ runs:
       run: |
         foreach ($target_framework in ConvertFrom-Json "${{steps.test-args.outputs.target_frameworks}}") {
           $trxFileName = "${{inputs.os}}-${{inputs.architecture}}-${{inputs.runtime-type}}-${{inputs.build_configuration}}-$target_framework.trx"
-          dotnet test "HarmonyTests/bin/${{inputs.build_configuration}}/$target_framework/HarmonyTests.dll" -f $target_framework --logger:"trx;LogFileName=TestResults/$trxFileName" --logger:"console;verbosity=normal" -- ${{steps.test-args.outputs.run_settings_args}}
+          dotnet test "HarmonyTests/bin/${{inputs.build_configuration}}/$target_framework/HarmonyTests.dll" -f $target_framework --logger:"trx;LogFileName=../TestResults/$trxFileName" --logger:"console;verbosity=normal" -- ${{steps.test-args.outputs.run_settings_args}}
         }
       shell: pwsh
 
@@ -118,31 +118,10 @@ runs:
           }
           foreach ($target_framework in ConvertFrom-Json "${{steps.test-args.outputs.target_frameworks}}") {
             $trxFileName = "${{inputs.os}}-${{inputs.architecture}}-${{inputs.runtime-type}}-${{inputs.build_configuration}}-$target_framework.trx"
-            & $dotnet test "HarmonyTests/bin/${{inputs.build_configuration}}/$target_framework/HarmonyTests.dll" -f $target_framework --logger:"trx;LogFileName=TestResults/$trxFileName" --logger:"console;verbosity=normal" -- ${{steps.test-args.outputs.run_settings_args}}
+            & $dotnet test "HarmonyTests/bin/${{inputs.build_configuration}}/$target_framework/HarmonyTests.dll" -f $target_framework --logger:"trx;LogFileName=../TestResults/$trxFileName" --logger:"console;verbosity=normal" -- ${{steps.test-args.outputs.run_settings_args}}
           }
         shell: pwsh
 
-    # Copy any TRX files that might have ended up in a nested directory
-    - name: Fix any nested TRX files (Windows)
-      if: runner.os == 'Windows'
-      run: |
-        $nestedDirs = Get-ChildItem -Path "TestResults" -Directory
-        foreach ($dir in $nestedDirs) {
-          $trxFiles = Get-ChildItem -Path $dir.FullName -Filter "*.trx" -File
-          foreach ($file in $trxFiles) {
-            Copy-Item -Path $file.FullName -Destination "TestResults\" -Force
-          }
-        }
-      shell: pwsh
-      continue-on-error: true
-
-    - name: Fix any nested TRX files (Unix)
-      if: runner.os != 'Windows'
-      run: |
-        find TestResults -mindepth 2 -name "*.trx" -type f -exec cp {} TestResults/ \;
-      shell: bash
-      continue-on-error: true
-        
     # Debug step for Windows
     - name: List TRX files (Windows)
       if: runner.os == 'Windows'
@@ -169,14 +148,6 @@ runs:
         fi
       shell: bash
 
-    # Ensure permissions are correct on Unix systems
-    - name: Set permissions (Unix)
-      if: runner.os != 'Windows'
-      run: |
-        chmod -R 755 TestResults
-      shell: bash
-      continue-on-error: true
-
     - name: Upload Test Result
       uses: ./.github/actions/test-upload-result
       if: ${{(inputs.upload_tests == 'true') && (always() || failure())}}

.github/actions/test-upload-result/action.yml

@@ -73,7 +73,7 @@ runs:
       with:
         name: ${{(inputs.experimental == 'true' && 'experimental-') || ''}}test-results-${{inputs.runtime-type}}-${{inputs.os}}-${{inputs.architecture}}${{inputs.target_framework && format('-{0}', inputs.target_framework) || ''}}-${{inputs.build_configuration}}
         path: |
-          TestResults/**/*.trx
+          TestResults/*.trx
         if-no-files-found: warn
         retention-days: 1
         compression-level: 0