devops: fix merge reports on PRs (#31232)
This commit is contained in:
parent
701a405bdf
commit
185cc43dbf
2
.github/actions/run-test/action.yml
vendored
2
.github/actions/run-test/action.yml
vendored
|
|
@ -86,7 +86,7 @@ runs:
|
||||||
shell: bash
|
shell: bash
|
||||||
- name: Upload blob report
|
- name: Upload blob report
|
||||||
# We only merge reports for PRs as per .github/workflows/create_test_report.yml.
|
# 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
|
uses: ./.github/actions/upload-blob-report
|
||||||
with:
|
with:
|
||||||
report_dir: blob-report
|
report_dir: blob-report
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,8 @@ const config: Config<PlaywrightWorkerOptions & PlaywrightTestOptions> = {
|
||||||
reporter: process.env.CI ? [
|
reporter: process.env.CI ? [
|
||||||
['dot'],
|
['dot'],
|
||||||
['json', { outputFile: path.join(outputDir, 'report.json') }],
|
['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',
|
] : 'line',
|
||||||
projects: [],
|
projects: [],
|
||||||
globalSetup: './globalSetup.ts'
|
globalSetup: './globalSetup.ts'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue