devops: fix merge reports on PRs (#31232)

.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

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'