From 1b350754d1e36bc3c1eeda0a9ce04dfe0bfa2ded Mon Sep 17 00:00:00 2001
From: Jonatan Antoni <jonatan.antoni@arm.com>
Date: Thu, 13 Oct 2022 17:14:31 +0200
Subject: [PATCH] Fix CoreValidation report workflow.

---
 .github/workflows/corevalidation-report.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/corevalidation-report.yml b/.github/workflows/corevalidation-report.yml
index b6f79b5b86..daab00f442 100644
--- a/.github/workflows/corevalidation-report.yml
+++ b/.github/workflows/corevalidation-report.yml
@@ -16,9 +16,7 @@ jobs:
       issues: read
       checks: write
       pull-requests: write
-    if: |
-      github.event.workflow_run.event == "pull_request" &&
-      github.event.workflow_run.conclusion != 'skipped'
+    if: github.event.workflow_run.conclusion != 'skipped'
 
     steps:
       - name: Download test results
@@ -29,8 +27,8 @@ jobs:
 
            artifacts_url=${{ github.event.workflow_run.artifacts_url }}
 
-           gh api "$artifacts_url" -q '.artifacts[] | select(.name=="tests") | [.name, .archive_download_url] | @tsv' | while read artifact
-           do
+           gh api "$artifacts_url" -q '.artifacts[] | select(.name=="tests" or .name=="EventFile") | [.name, .archive_download_url] | @tsv' | \
+           while read artifact; do
              IFS=$'\t' read name url <<< "$artifact"
              gh api $url > "$name.zip"
              unzip -d "$name" "$name.zip"
@@ -40,7 +38,7 @@ jobs:
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
           commit: ${{ github.event.workflow_run.head_sha }}
-          event_file: artifacts/Event File/event.json
+          event_file: artifacts/EventFile/event.json
           report_individual_runs: true
           event_name: ${{ github.event.workflow_run.event }}
           junit_files: "artifacts/**/*.junit"