From 6d1f41846f407c17360d4cb759cee43de69eae4f Mon Sep 17 00:00:00 2001 From: Nicolas Ayral Seydoux Date: Thu, 17 Sep 2026 22:12:53 +0200 Subject: [PATCH 1/2] Avoid duplicate CI runs on the merge queue Pushing the merge queue branch emits both a `push` and a `merge_group` event, so CI ran twice on the same commit. That caused a failure due to concurrency groups cancelling one of the runs. This replaces the `push` trigger with `pull_request`, so that the event is not fired in the merge queue. This way, CI runs only once. --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b01a294..fcf9dcf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,8 @@ name: CI -# Run the required tests on the merge queue. -on: [push, merge_group] +on: + pull_request: + merge_group: env: CI: true From 1346c2aa03f89c5535af742e94fe0eb4f8c43ba0 Mon Sep 17 00:00:00 2001 From: Nicolas Ayral Seydoux Date: Fri, 18 Sep 2026 10:37:57 +0200 Subject: [PATCH 2/2] fixup! Avoid duplicate CI runs on the merge queue --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcf9dcf..c264f49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,6 @@ name: CI -on: - pull_request: - merge_group: +on: [pull_request, merge_group] env: CI: true