Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit c530937

Browse files
committed
Merge branch 't3chguy/fix-netlify' of github.com:matrix-org/matrix-react-sdk into t3chguy/terminate-workers
2 parents 82d73b9 + 5db3cca commit c530937

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.github/workflows/end-to-end-tests-netlify.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ concurrency:
1313

1414
jobs:
1515
report:
16+
if: github.event.workflow_run.conclusion != 'cancelled'
1617
name: Report results
1718
runs-on: ubuntu-latest
1819
environment: Netlify

.github/workflows/netlify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- completed
99
jobs:
1010
deploy:
11-
if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request'
11+
if: github.event.workflow_run.conclusion != 'cancelled' && github.event.workflow_run.event == 'pull_request'
1212
runs-on: ubuntu-latest
1313
environment: Netlify
1414
steps:

0 commit comments

Comments
 (0)