From 0fe9c2e4a3819ad104bbf04cc4f60031ef4a76b4 Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <v.g.vassilev@gmail.com>
Date: Thu, 25 Jan 2024 22:31:52 +0200
Subject: [PATCH 1/3] [ci] Cancel the pending PR builds on a new push.

---
 .github/workflows/root-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml
index 8a1218ed33797..666940234433f 100644
--- a/.github/workflows/root-ci.yml
+++ b/.github/workflows/root-ci.yml
@@ -75,6 +75,10 @@ env:
   OS_INTERFACE: 'public'
   OS_REGION_NAME: 'cern'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
 jobs:
   build-macos:
     if: github.repository_owner == 'root-project' || github.event_name == 'pull_request'

From b56bb1c69d3666e07fa1deeed08e2ac9af3c6b38 Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <v.g.vassilev@gmail.com>
Date: Fri, 26 Jan 2024 07:32:40 +0200
Subject: [PATCH 2/3] Update .github/workflows/root-ci.yml

---
 .github/workflows/root-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml
index 666940234433f..a89f8427cb0f6 100644
--- a/.github/workflows/root-ci.yml
+++ b/.github/workflows/root-ci.yml
@@ -77,7 +77,7 @@ env:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   build-macos:

From 479db0c0d0a630df2bbb5dbfaeb740500bebf0ca Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <v.g.vassilev@gmail.com>
Date: Wed, 31 Jan 2024 11:06:40 +0200
Subject: [PATCH 3/3] Update .github/workflows/root-ci.yml

Co-authored-by: Jonas Hahnfeld <jonas.hahnfeld@cern.ch>
---
 .github/workflows/root-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml
index a89f8427cb0f6..cf18d831b3dfd 100644
--- a/.github/workflows/root-ci.yml
+++ b/.github/workflows/root-ci.yml
@@ -76,8 +76,8 @@ env:
   OS_REGION_NAME: 'cern'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
   build-macos: