From 2a69093136f21cbb7e523e67372ac14c5f844551 Mon Sep 17 00:00:00 2001
From: vlakoff <544424+vlakoff@users.noreply.github.com>
Date: Thu, 23 Apr 2026 00:17:37 +0200
Subject: [PATCH] Implement merge_group trigger and concurrency control

- Add merge_group event to oxipng.yml and docker.yml for native
  Merge Queue support.
- Implement concurrency groups with cancel-in-progress: true to
  terminate obsolete builds on new pushes.
- Remove explicit pull_request types to allow default triggers
  (including reopened).
---
 .github/workflows/deploy.yml | 4 ++++
 .github/workflows/docker.yml | 8 +++++---
 .github/workflows/oxipng.yml | 8 +++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c49e73b5..16181e4e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -5,6 +5,10 @@ on:
     tags:
       - "v*.*.*"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 permissions:
   actions: read
   contents: write
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 66a3de4c..da2e2e33 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,9 +6,7 @@ on:
     tags:
       - 'v*.*.*'
   pull_request:
-    types:
-      - opened
-      - synchronize
+  merge_group:
   workflow_dispatch:
     inputs:
       use_cache:
@@ -17,6 +15,10 @@ on:
         type: boolean
         default: true
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     uses: docker/github-builder/.github/workflows/build.yml@v1
diff --git a/.github/workflows/oxipng.yml b/.github/workflows/oxipng.yml
index 7c033914..1cc93064 100644
--- a/.github/workflows/oxipng.yml
+++ b/.github/workflows/oxipng.yml
@@ -3,11 +3,13 @@ name: oxipng
 on:
   push:
   pull_request:
-    types:
-      - opened
-      - synchronize
+  merge_group:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   ci:
     name: CI