From 186ccf260264eeb2c94690da5f383e829573ed74 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Fri, 16 May 2025 00:16:46 +0530
Subject: [PATCH] fix(gha): do not cancel for main/prod branches (#60383)

---
 .github/workflows/e2e-playwright.yml  | 2 +-
 .github/workflows/e2e-third-party.yml | 8 ++------
 .github/workflows/node.js-tests.yml   | 7 +------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/e2e-playwright.yml b/.github/workflows/e2e-playwright.yml
index e2f10ebf9d7..87363f41585 100644
--- a/.github/workflows/e2e-playwright.yml
+++ b/.github/workflows/e2e-playwright.yml
@@ -13,7 +13,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.workflow_run.head_branch || github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ !contains(github.ref, 'main') && !contains(github.ref, 'prod-') }}
 
 jobs:
   build-client:
diff --git a/.github/workflows/e2e-third-party.yml b/.github/workflows/e2e-third-party.yml
index edcefbd74f4..027b7ed6f3e 100644
--- a/.github/workflows/e2e-third-party.yml
+++ b/.github/workflows/e2e-third-party.yml
@@ -1,18 +1,14 @@
 name: CI - E2E - 3rd party donation tests
 
-# These are only run on prod-* branches to test the 3rd party donation flow
-
 on:
+  workflow_dispatch:
   push:
     branches:
       - 'prod-**'
 
-  # to test this ad-hoc
-  workflow_dispatch:
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.workflow_run.head_branch || github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ !contains(github.ref, 'main') && !contains(github.ref, 'prod-') }}
 
 jobs:
   do-everything:
diff --git a/.github/workflows/node.js-tests.yml b/.github/workflows/node.js-tests.yml
index 1f69be36379..5c7812d8393 100644
--- a/.github/workflows/node.js-tests.yml
+++ b/.github/workflows/node.js-tests.yml
@@ -1,23 +1,18 @@
 name: CI - Node.js
 
 on:
-  # Run on push events, but only for the below branches
   push:
     branches:
       - 'main'
       - 'prod-**'
-  # Run on pull requests, but only for the below targets
   pull_request:
     branches:
       - 'main'
       - 'temp-**' # Temporary branches allowed on Upstream
-  # Run on Merge Queue
-  merge_group:
-    types: [checks_requested]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.workflow_run.head_branch || github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ !contains(github.ref, 'main') && !contains(github.ref, 'prod-') }}
 
 permissions:
   contents: read