From 88349242770da5c776de845412370d939a925f4a Mon Sep 17 00:00:00 2001
From: Bruno Alexandre Rosa <1791393+brunoalr@users.noreply.github.com>
Date: Thu, 12 Mar 2026 17:02:55 -0300
Subject: [PATCH] fixup! Merge branch 'master' into ci/use-ninja-win

---
 .github/workflows/desktop-build.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index a8b633ef4..e1bb6606f 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -38,10 +38,13 @@ on:
       - 'vcpkg.json'
       - 'vcpkg'
 
-# Cancel earlier, unfinished runs of this workflow on the same branch (unless on master)
+# Ensure at most one run per ref: queue new runs when one is in progress.
+# On master, cancel-in-progress is false so each push gets full CI (runs queue).
+# On other refs (tags, PRs), cancel-in-progress is true to avoid redundant builds.
+# Using github.ref ensures stable grouping (ref_name can be empty in some events).
 concurrency:
-  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
-  cancel-in-progress: ${{ github.ref_name != 'master' }}
+  group: "${{ github.workflow }} @ ${{ github.ref || github.run_id }}"
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
 jobs:
   configure: