From 4fb4b8404cf4993bb019ceb029d8f2654b6ced02 Mon Sep 17 00:00:00 2001
From: ebbit1q <ebbit1q@gmail.com>
Date: Fri, 10 Apr 2026 18:59:29 +0200
Subject: [PATCH] allow canceling concurrent builds on master for both desktop
 and docker

---
 .github/workflows/desktop-build.yml  | 4 ++--
 .github/workflows/docker-release.yml | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 60c216d8d..21ae7f45f 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -38,10 +38,10 @@ on:
       - 'vcpkg.json'
       - 'vcpkg'
 
-# Cancel earlier, unfinished runs of this workflow on the same branch (unless on master)
+# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.ref_name }}"
-  cancel-in-progress: ${{ github.ref_name != 'master' }}
+  cancel-in-progress: ${{ github.ref_type != 'tag' }}
 
 jobs:
   configure:
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index cdcf77e97..fca1e97d4 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -13,6 +13,11 @@ on:
       - '.github/workflows/docker-release.yml'
       - 'Dockerfile'
 
+# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
+  cancel-in-progress: ${{ github.ref_type != 'tag' }}
+
 jobs:
   docker:
     name: amd64 & arm64