From c87ae5a8ba052beea1d6bbce55556d0fb1278272 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Sat, 12 Apr 2025 03:24:12 -0500
Subject: [PATCH] fix(GHA): improve specificity of concurrency (#59677)

---
 .github/workflows/e2e-playwright.yml       | 7 ++-----
 .github/workflows/e2e-third-party.yml      | 5 ++---
 .github/workflows/github-labeler.yaml      | 2 +-
 .github/workflows/i18n-validate-builds.yml | 2 +-
 .github/workflows/i18n-validate-prs.yml    | 2 +-
 .github/workflows/node.js-tests.yml        | 4 ++--
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/e2e-playwright.yml b/.github/workflows/e2e-playwright.yml
index 71988af629a..93e7dddb8a4 100644
--- a/.github/workflows/e2e-playwright.yml
+++ b/.github/workflows/e2e-playwright.yml
@@ -7,15 +7,12 @@ on:
       - completed
   # TODO: refactor with a workflow_call
   pull_request:
-    paths-ignore:
-      - 'docs/**'
     branches:
       - 'main'
-      - 'next-**'
-      - 'e2e-**'
+      - 'temp-**' # Temporary branches allowed on Upstream
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.workflow_run.head_branch || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/e2e-third-party.yml b/.github/workflows/e2e-third-party.yml
index f84bd19e63c..8e056b48ceb 100644
--- a/.github/workflows/e2e-third-party.yml
+++ b/.github/workflows/e2e-third-party.yml
@@ -6,13 +6,12 @@ on:
   push:
     branches:
       - 'prod-**'
-    paths-ignore:
-      - 'docs/**'
+
   # to test this ad-hoc
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.workflow_run.head_branch || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/github-labeler.yaml b/.github/workflows/github-labeler.yaml
index 57c6a20e7a0..99b4fa6f96a 100644
--- a/.github/workflows/github-labeler.yaml
+++ b/.github/workflows/github-labeler.yaml
@@ -6,7 +6,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.workflow_run.head_branch || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/i18n-validate-builds.yml b/.github/workflows/i18n-validate-builds.yml
index ea5dbb17053..4e6c06ee0a9 100644
--- a/.github/workflows/i18n-validate-builds.yml
+++ b/.github/workflows/i18n-validate-builds.yml
@@ -5,7 +5,7 @@ on:
       - main
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.workflow_run.head_branch || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/i18n-validate-prs.yml b/.github/workflows/i18n-validate-prs.yml
index 8d5f64ed930..b77ceb4b734 100644
--- a/.github/workflows/i18n-validate-prs.yml
+++ b/.github/workflows/i18n-validate-prs.yml
@@ -5,7 +5,7 @@ on:
       - main
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.workflow_run.head_branch || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/node.js-tests.yml b/.github/workflows/node.js-tests.yml
index 49fc8cac25e..d0ec28a3e67 100644
--- a/.github/workflows/node.js-tests.yml
+++ b/.github/workflows/node.js-tests.yml
@@ -10,13 +10,13 @@ on:
   pull_request:
     branches:
       - 'main'
-      - 'next-**'
+      - '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.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.workflow_run.head_branch || github.ref }}
   cancel-in-progress: true
 
 permissions: