From 8ab91d83fe667b13c9cd9c0154755396588e6ce5 Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Thu, 9 Jul 2026 15:53:39 +0300
Subject: [PATCH 1/2] Reduce CI build matrix on macOS/Windows and add
 concurrency groups

Mirror OpenAM #1064 and #1065 for the OpenIG workflows:

- build.yml: keep the full Java matrix (11, 17, 21, 25, 26) on
  ubuntu-latest, but only exercise the min/max JDKs (11 and 26) on
  macos-latest and windows-latest via matrix include, cutting the
  build-maven matrix from 15 jobs to 9 while keeping OS smoke
  coverage on the JDK edges.
- Add a top-level concurrency group keyed on workflow + ref to every
  workflow: build.yml cancels the superseded in-progress run
  (cancel-in-progress=true), while deploy.yml and release.yml queue
  instead (cancel-in-progress=false) so an in-flight Maven Central
  publish, tag push or GitHub release is never aborted midway.
---
 .github/workflows/build.yml   | 10 +++++++++-
 .github/workflows/deploy.yml  |  3 +++
 .github/workflows/release.yml |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1c92dcd7..8ca73b17 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,13 +4,21 @@ on:
   push:
     branches: [ 'sustaining/5.4.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' ]
+        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 d09f6967..edba046b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -6,6 +6,9 @@ on:
     branches: [ 'sustaining/5.4.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 6037d0e3..5affe485 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 cd24e355d7299c4f865229e60db22e9251521cb1 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Thu, 9 Jul 2026 16:14:15 +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 edba046b..03026e3e 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: