From f1f970166cbde9bc92e35158df05cc5d895f150e Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Thu, 10 Mar 2022 19:36:23 +0100
Subject: [PATCH] We ran into https://github.com/dorny/test-reporter/issues/67
 too, so we'll have to ignore test report generation for pull requests
 (repo-local PRs are preceded by normal build events that will generate the
 report)

---
 .github/workflows/build-ilspy.yml  | 12 +++++++++++-
 .github/workflows/test-reports.yml | 23 -----------------------
 2 files changed, 11 insertions(+), 24 deletions(-)
 delete mode 100644 .github/workflows/test-reports.yml

diff --git a/.github/workflows/build-ilspy.yml b/.github/workflows/build-ilspy.yml
index 3121425433..86004d42de 100644
--- a/.github/workflows/build-ilspy.yml
+++ b/.github/workflows/build-ilspy.yml
@@ -58,13 +58,23 @@ jobs:
         Tests2: ILSpy.Tests\bin\${{ matrix.configuration }}\net6.0-windows\ILSpy.Tests.dll
         Tests3: ILSpy.BamlDecompiler.Tests\bin\${{ matrix.configuration }}\net6.0-windows\win-x64\ILSpy.BamlDecompiler.Tests.dll
 
-    - name: Upload Test Report
+    - name: Upload Test Logs
       uses: actions/upload-artifact@v2
       if: success() || failure()
       with:
         name: test-results-${{ matrix.configuration }}
         path: '**/*.trx'
 
+    - name: Create Test Report
+      uses: phoenix-actions/test-reporting@v6
+      if: github.event_name != 'pull_request' && (success() || failure())
+      with:
+        name: Unit Test Results (${{ matrix.configuration }})
+        path: '**/*.trx'
+        reporter: dotnet-trx
+        list-suites: 'all'
+        list-tests: 'failed'
+
     - name: Style - tab check
       run: python BuildTools\tidy.py
     
diff --git a/.github/workflows/test-reports.yml b/.github/workflows/test-reports.yml
deleted file mode 100644
index 2ec7ff1e45..0000000000
--- a/.github/workflows/test-reports.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: 'Test Report'
-on:
-  workflow_run:
-    workflows: ['Build ILSpy']
-    types:
-      - completed
-jobs:
-  report:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        Configuration: [ Debug, Release ]
-
-    steps:
-    - name: Test Report
-      uses: phoenix-actions/test-reporting@v6
-      with:
-        artifact: test-results-${{ matrix.configuration }}
-        name: Unit Test Results (${{ matrix.configuration }})
-        path: '**/*.trx'
-        reporter: dotnet-trx
-        list-suites: 'all'
-        list-tests: 'failed'
\ No newline at end of file