From 51f71567d7f9678c0d2e90abf50a31d59b7f05ae Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 14 May 2024 15:55:12 +0100
Subject: [PATCH] Fix Netlify deployments not publishing when expected (#12521)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .github/workflows/end-to-end-tests-netlify.yaml | 1 +
 .github/workflows/netlify.yaml                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/end-to-end-tests-netlify.yaml b/.github/workflows/end-to-end-tests-netlify.yaml
index 7e4cd0ac3a..4667bfb02b 100644
--- a/.github/workflows/end-to-end-tests-netlify.yaml
+++ b/.github/workflows/end-to-end-tests-netlify.yaml
@@ -13,6 +13,7 @@ concurrency:
 
 jobs:
     report:
+        if: github.event.workflow_run.conclusion != 'cancelled'
         name: Report results
         runs-on: ubuntu-latest
         environment: Netlify
diff --git a/.github/workflows/netlify.yaml b/.github/workflows/netlify.yaml
index 1fe6a9a2cc..911bfccbf4 100644
--- a/.github/workflows/netlify.yaml
+++ b/.github/workflows/netlify.yaml
@@ -8,7 +8,7 @@ on:
             - completed
 jobs:
     deploy:
-        if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request'
+        if: github.event.workflow_run.conclusion != 'cancelled' && github.event.workflow_run.event == 'pull_request'
         runs-on: ubuntu-latest
         environment: Netlify
         steps: