From 693fde62852a471e14dbb1805899b02f1912bfe9 Mon Sep 17 00:00:00 2001
From: Domenico Sibilio <domenicosibilio@gmail.com>
Date: Thu, 23 Feb 2023 16:22:13 +0100
Subject: [PATCH] ACS-3750 Fix cancelled workflow condition (#649)

---
 .github/workflows/ci.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a893a1c1..316038e8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,7 +45,9 @@ jobs:
     name: ${{ matrix.name }}
     runs-on: ubuntu-latest
     needs: [build]
-    if: "!contains(github.event.head_commit.message, '[skip tests]')"
+    if: >
+      !(failure() || cancelled()) &&
+      !contains(github.event.head_commit.message, '[skip tests]')
     strategy:
       fail-fast: false
       matrix:
@@ -108,7 +110,9 @@ jobs:
     name: "Publish artifacts"
     runs-on: ubuntu-latest
     needs: [tests]
-    if: github.event_name != 'pull_request'
+    if: >
+      !(failure() || cancelled()) &&
+      github.event_name != 'pull_request'
     steps:
       - uses: actions/checkout@v3
       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.0