From 20470dbc97d489ad84547798ef16e8f762b55b85 Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Thu, 9 Jul 2026 16:05:31 +0300
Subject: [PATCH 1/2] CI: trim build matrix on macOS/Windows and add workflow
 concurrency

- build.yml: run the full JDK matrix (11, 17, 21, 25, 26) only on Ubuntu;
  macOS and Windows now smoke-test just the min (11) and max (26) JDKs,
  cutting the matrix from 15 jobs to 9.
- Add concurrency groups keyed on workflow+ref: cancel-in-progress for
  build.yml, and cancel-in-progress: false for release.yml and deploy.yml
  so publishing/release runs queue instead of being interrupted.

Analogous to OpenAM #1064 and #1065.
---
 .github/workflows/build.yml   | 17 ++++++++++++++++-
 .github/workflows/deploy.yml  |  3 +++
 .github/workflows/release.yml |  3 +++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 50bcb64d..8951d6ab 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,13 +4,28 @@ on:
   push:
     branches: [ 'sustaining/1.8.x','master', 'issues/**', 'features/**' ]
   pull_request:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
   build-maven:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os: [ 'ubuntu-latest' ]
         java: [ '11', '17', '21', '25', '26' ]
-        os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
+        # macOS and Windows runners are the slowest and scarcest in CI, so only
+        # smoke-test the minimum (11) and maximum (26) supported JDKs on them.
+        # Ubuntu keeps the full JDK matrix above.
+        include:
+          - os: 'macos-latest'
+            java: '11'
+          - os: 'macos-latest'
+            java: '26'
+          - os: 'windows-latest'
+            java: '11'
+          - os: 'windows-latest'
+            java: '26'
       fail-fast: false
     steps:
       - uses: actions/checkout@v6
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5c84a186..4d4676e9 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -6,6 +6,9 @@ on:
     branches: [ 'sustaining/1.8.x','master' ]
     workflows: ["Build","Release"]
     types: [completed]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
 
 jobs:
   deploy-maven:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c4f684ed..d69e9368 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 78470569d235bc1a54f147eb47299dea1a454bcf Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Thu, 9 Jul 2026 16:15:15 +0300
Subject: [PATCH 2/2] Apply suggestion from @maximthomas

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 4d4676e9..161c29c6 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: