From 185cc43dbf8dee8f31e10205c136c66dc4efb6a0 Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Mon, 10 Jun 2024 19:21:02 +0200
Subject: [PATCH] devops: fix merge reports on PRs (#31232)

---
 .github/actions/run-test/action.yml | 2 +-
 tests/electron/playwright.config.ts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/actions/run-test/action.yml b/.github/actions/run-test/action.yml
index dcf8168367..c193515c45 100644
--- a/.github/actions/run-test/action.yml
+++ b/.github/actions/run-test/action.yml
@@ -86,7 +86,7 @@ runs:
       shell: bash
     - name: Upload blob report
       # We only merge reports for PRs as per .github/workflows/create_test_report.yml.
-      if: ${{ !cancelled() && github.event.workflow_run.event == 'pull_request' }}
+      if: ${{ !cancelled() && github.event_name == 'pull_request' }}
       uses: ./.github/actions/upload-blob-report
       with:
         report_dir: blob-report
diff --git a/tests/electron/playwright.config.ts b/tests/electron/playwright.config.ts
index b630b38e56..a16b3b480f 100644
--- a/tests/electron/playwright.config.ts
+++ b/tests/electron/playwright.config.ts
@@ -35,7 +35,8 @@ const config: Config<PlaywrightWorkerOptions & PlaywrightTestOptions> = {
   reporter: process.env.CI ? [
     ['dot'],
     ['json', { outputFile: path.join(outputDir, 'report.json') }],
-    ['blob', { fileName: `${process.env.PWTEST_BOT_NAME}.zip` }],
+    // Needed since tests/electron/package.json exists which would otherwise be picked up as tests/electron/ (outputDir)
+    ['blob', { fileName: path.join(__dirname, '../../blob-report/', `${process.env.PWTEST_BOT_NAME}.zip`) }],
   ] : 'line',
   projects: [],
   globalSetup: './globalSetup.ts'