From 980d5dcd1ef150b0ee8665cc76320d31701f4cbd Mon Sep 17 00:00:00 2001
From: vlakoff <544424+vlakoff@users.noreply.github.com>
Date: Thu, 30 Apr 2026 09:15:15 +0200
Subject: [PATCH] Include event_name in CI concurrency group keys

This allows simplifying the rest of the key to just github.ref,
replacing the previous chain of fallbacks.
---
 .github/workflows/docker.yml | 6 +-----
 .github/workflows/oxipng.yml | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b00b05eb..8e703812 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -18,11 +18,7 @@ on:
         default: true
 
 concurrency:
-  group: >-
-    ${{ github.workflow }}-
-    ${{ github.event.pull_request.number ||
-        (github.event_name == 'merge_group' && format('mq-{0}', github.event.merge_group.head_ref)) ||
-        github.ref }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/oxipng.yml b/.github/workflows/oxipng.yml
index 991fb062..53cecfc2 100644
--- a/.github/workflows/oxipng.yml
+++ b/.github/workflows/oxipng.yml
@@ -9,11 +9,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: >-
-    ${{ github.workflow }}-
-    ${{ github.event.pull_request.number ||
-        (github.event_name == 'merge_group' && format('mq-{0}', github.event.merge_group.head_ref)) ||
-        github.ref }}
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs: