From 2b9ae6ad950518b00da5d06c9a92dc1a2822b8dd Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 27 Nov 2025 10:26:59 +0100
Subject: [PATCH] change concurrency settings (try to avoid "Error: The
 operation was canceled.")

Not sure if it helps. Just testing..
See https://github.com/actions/runner-images/issues/13263

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .github/workflows/analysis.yml               | 2 +-
 .github/workflows/assembleFlavors.yml        | 2 +-
 .github/workflows/autoApproveSync.yml        | 2 +-
 .github/workflows/check.yml                  | 2 +-
 .github/workflows/detectNewJavaFiles.yml     | 2 +-
 .github/workflows/fixup.yml                  | 2 +-
 .github/workflows/qa.yml                     | 2 +-
 .github/workflows/renovate-approve-merge.yml | 4 ++--
 .github/workflows/scorecard.yml              | 4 ++--
 .github/workflows/unit-tests.yml             | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index b0ea98e8d04..baa3b692361 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -21,7 +21,7 @@ permissions:
     contents: write
 
 concurrency:
-    group: analysis-wrapper-${{ github.head_ref || github.run_id }}
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
     cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/assembleFlavors.yml b/.github/workflows/assembleFlavors.yml
index ce6237c88a9..65c6af199c4 100644
--- a/.github/workflows/assembleFlavors.yml
+++ b/.github/workflows/assembleFlavors.yml
@@ -11,7 +11,7 @@ on:
 permissions: read-all
 
 concurrency:
-  group: assemble-flavors-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/autoApproveSync.yml b/.github/workflows/autoApproveSync.yml
index c215be0b3e8..d2f1388c168 100644
--- a/.github/workflows/autoApproveSync.yml
+++ b/.github/workflows/autoApproveSync.yml
@@ -17,7 +17,7 @@ on:
       - labeled
 
 concurrency:
-  group: sync-approve-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 permissions:
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index bcd48854e51..f86577d3078 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -11,7 +11,7 @@ on:
 permissions: read-all
 
 concurrency:
-  group: check-kotlin-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/detectNewJavaFiles.yml b/.github/workflows/detectNewJavaFiles.yml
index 908e3fd288f..df945588e98 100644
--- a/.github/workflows/detectNewJavaFiles.yml
+++ b/.github/workflows/detectNewJavaFiles.yml
@@ -15,7 +15,7 @@ on:
 permissions: read-all
 
 concurrency:
-  group: detect-new-java-files-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/fixup.yml b/.github/workflows/fixup.yml
index 69da2bbb039..c5e13bd7297 100644
--- a/.github/workflows/fixup.yml
+++ b/.github/workflows/fixup.yml
@@ -16,7 +16,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: fixup-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
index c753164383d..cd354d6699a 100644
--- a/.github/workflows/qa.yml
+++ b/.github/workflows/qa.yml
@@ -12,7 +12,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: qa-build-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/renovate-approve-merge.yml b/.github/workflows/renovate-approve-merge.yml
index c6f0dc0c0a7..9d9e925cd2e 100644
--- a/.github/workflows/renovate-approve-merge.yml
+++ b/.github/workflows/renovate-approve-merge.yml
@@ -19,7 +19,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: renovate-approve-merge-${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -58,4 +58,4 @@ jobs:
         run: gh pr merge --merge --auto
         env:
           GH_TOKEN: ${{ secrets.AUTOMERGE }}
-          
+
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 9871c2721c5..0496bd2e1a2 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -15,8 +15,8 @@ on:
 # Declare default permissions as read only.
 permissions: read-all
 
-concurrency: 
-  group: scorecard-supply-chain-security-${{ github.head_ref || github.run_id }}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 21cbd4acad1..ba229039f34 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -14,7 +14,7 @@ permissions:
     pull-requests: write
 
 concurrency:
-    group: unit-tests-${{ github.head_ref || github.run_id }}
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
     cancel-in-progress: true
 
 jobs: