From 323f65beadbfb9d2bcf29af31840be652564c304 Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Thu, 9 Jul 2026 15:42:53 +0300
Subject: [PATCH 1/2] Add concurrency groups to CI workflows

Add a top-level concurrency group keyed on workflow + ref to every
GitHub Actions workflow so redundant runs on the same ref collapse:

- build.yml: cancel-in-progress=true, so a new push/PR build cancels the
  now-superseded in-flight one (the main runner-time saver).
- release.yml / deploy.yml: cancel-in-progress=false, so overlapping runs
  queue instead of aborting an in-flight Maven Central publish, tag push
  or GitHub release midway.
---
 .github/workflows/build.yml   | 3 +++
 .github/workflows/deploy.yml  | 3 +++
 .github/workflows/release.yml | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6383f71179..29d0884ba5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,6 +17,9 @@ on:
   push:
     branches: [ 'sustaining/15.2.x','master','issues/**','features/**' ]
   pull_request:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   build-maven:
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 3de8aa7960..1a4035d21b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -6,6 +6,9 @@ on:
     branches: [ 'sustaining/15.2.x','master' ]
     workflows: ["Build","Release"]
     types: [completed]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
 jobs:
   deploy-maven:
     if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event=='push'}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 41f4f78214..ddeb2a1870 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,6 +11,9 @@ on:
         description: "Default version to use for new local working copy."
         required: true
         default: "X.Y.Z-SNAPSHOT"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
 jobs:
   release-maven:
     runs-on: 'ubuntu-latest'

From a152f2ae1d3f9527eb86ac53031ef5a5745d08ce Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Thu, 9 Jul 2026 16:12:57 +0300
Subject: [PATCH 2/2] Update .github/workflows/deploy.yml

Co-authored-by: Maxim Thomas <maxim.thomas@gmail.com>
---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1a4035d21b..eb0945b04d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,7 +7,7 @@ on:
     workflows: ["Build","Release"]
     types: [completed]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: false
 jobs:
   deploy-maven: