From 880531cc2d80d2d3cba32a03bdb82023cbd88e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9lder=20Greg=C3=B3rio?= <helder.gregorio@dremio.com>
Date: Thu, 22 Oct 2026 21:53:14 +0100
Subject: [PATCH] MINOR: [CI] Scope build cancellation to pull request runs

Use the event type and full ref in the concurrency group for Dev, Test,
Integration and RC. Pull request refs distinguish PRs from different
forks even when their branch names match. Cancel superseded pull request
runs while keeping other event types in separate groups and allowing
their active runs to complete.
---
 .github/workflows/dev.yml         | 4 ++--
 .github/workflows/integration.yml | 4 ++--
 .github/workflows/rc.yml          | 4 ++--
 .github/workflows/test.yml        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index f4dc9ad6f1..3b92d62961 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -24,8 +24,8 @@ on:
       - dependabot/**
 
 concurrency:
-  group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
+  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 permissions:
   contents: read
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 4120e5321c..639d79e46b 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -47,8 +47,8 @@ on:
       - 'vector/**'
 
 concurrency:
-  group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
-  cancel-in-progress: true
+  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 permissions:
   contents: read
diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml
index 2af245805d..31bace232f 100644
--- a/.github/workflows/rc.yml
+++ b/.github/workflows/rc.yml
@@ -27,8 +27,8 @@ on:
   schedule:
     - cron: "0 0 * * *"
 concurrency:
-  group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
-  cancel-in-progress: true
+  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 permissions:
   contents: read
 jobs:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b9cd01a770..f2945d4b9a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,8 +27,8 @@ on:
   pull_request:
 
 concurrency:
-  group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
-  cancel-in-progress: true
+  group: ${{ github.repository }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 permissions:
   contents: read