From 0c9dd4e471f4e97dc29141caf2319a3be02d4511 Mon Sep 17 00:00:00 2001
From: Barrett Ruth <62671086+barrettruth@users.noreply.github.com>
Date: Fri, 1 May 2026 13:12:19 -0400
Subject: [PATCH] ci(optional): avoid reruns from unrelated labels #39547

Problem: Optional CI reevaluates on unrelated label events and shares
one workflow-wide concurrency group. One optional label change can
cancel in-flight jobs for the other optional suite.

Solution: Only reevaluate each optional job when its own label changes,
and move concurrency to the job level. This keeps `s390x` and
`windows-asan` from restarting each other.

(cherry picked from commit 085bb518c894a6b03aaf23ba81242c2c6126bea8)
---
 .github/workflows/optional.yml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/optional.yml b/.github/workflows/optional.yml
index acaf3644c7..4775ff743a 100644
--- a/.github/workflows/optional.yml
+++ b/.github/workflows/optional.yml
@@ -7,10 +7,6 @@ on:
 permissions:
   contents: read
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
-
 env:
   INSTALL_PREFIX: ${{ github.workspace }}/nvim-install
   # Double test timeout since it's running via qemu
@@ -20,7 +16,15 @@ env:
 
 jobs:
   s390x:
-    if: contains(github.event.pull_request.labels.*.name, 'ci:s390x') || github.event_name == 'workflow_dispatch'
+    if: >-
+      github.event_name == 'workflow_dispatch' ||
+      (
+        contains(github.event.pull_request.labels.*.name, 'ci:s390x') &&
+        (github.event.action != 'labeled' || github.event.label.name == 'ci:s390x')
+      )
+    concurrency:
+      group: ${{ github.workflow }}-s390x-${{ github.ref }}
+      cancel-in-progress: ${{ github.event_name == 'pull_request' }}
     strategy:
       fail-fast: false
       matrix:
@@ -51,7 +55,15 @@ jobs:
             "
 
   windows-asan:
-    if: contains(github.event.pull_request.labels.*.name, 'ci:windows-asan') || github.event_name == 'workflow_dispatch'
+    if: >-
+      github.event_name == 'workflow_dispatch' ||
+      (
+        contains(github.event.pull_request.labels.*.name, 'ci:windows-asan') &&
+        (github.event.action != 'labeled' || github.event.label.name == 'ci:windows-asan')
+      )
+    concurrency:
+      group: ${{ github.workflow }}-windows-asan-${{ github.ref }}
+      cancel-in-progress: ${{ github.event_name == 'pull_request' }}
     uses: ./.github/workflows/test_windows.yml
     with:
       build_flags: "-D ENABLE_ASAN_UBSAN=ON"