From 0ec84c037eb7fdd7488cafac0d014a0b18888fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 12 Nov 2024 11:35:44 +0100
Subject: [PATCH] Fix CI test report workflow

Carbon copy of https://github.com/ppy/osu/pull/30543.
---
 .github/workflows/report-nunit.yml | 34 +++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/report-nunit.yml b/.github/workflows/report-nunit.yml
index a26723d84f..476000a223 100644
--- a/.github/workflows/report-nunit.yml
+++ b/.github/workflows/report-nunit.yml
@@ -5,30 +5,40 @@
 name: Annotate CI run with test results
 on:
   workflow_run:
-    workflows: ["Continuous Integration"]
+    workflows: [ "Continuous Integration" ]
     types:
       - completed
+
+permissions:
+  contents: read
+  actions: read
+  checks: write
+
 jobs:
   annotate:
     name: Annotate CI run with test results
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion != 'cancelled' }}
-    strategy:
-       fail-fast: false
-       matrix:
-          os:
-            - { prettyname: Windows, configuration: Debug }
-            - { prettyname: macOS, configuration: Debug }
-            - { prettyname: Linux, configuration: Debug }
-            - { prettyname: Linux, configuration: Release }
-          threadingMode: ['SingleThread', 'MultiThreaded']
     timeout-minutes: 5
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.workflow_run.repository.full_name }}
+          ref: ${{ github.event.workflow_run.head_sha }}
+
+      - name: Download results
+        uses: actions/download-artifact@v4
+        with:
+          pattern: osu-framework-test-results-*
+          merge-multiple: true
+          run-id: ${{ github.event.workflow_run.id }}
+          github-token: ${{ github.token }}
+
       - name: Annotate CI run with test results
         uses: dorny/test-reporter@v1.8.0
         with:
-          artifact: osu-framework-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}}-${{matrix.os.configuration}}
-          name: Test Results (${{matrix.os.prettyname}}, ${{matrix.threadingMode}}, ${{matrix.os.configuration}})
+          name: Results
           path: "*.trx"
           reporter: dotnet-trx
           list-suites: 'failed'