From 2829403e5072d73bff346ab1ccaf50d9328d9dba Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 24 Apr 2026 15:49:15 -0400
Subject: [PATCH] ci: Enable merge_group trigger for merge queue support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add merge_group to the CI workflow triggers so that GitHub merge
queues can be used. This is a prerequisite for enabling merge queues
on the repository.

Also drop the PR number from artifact names — artifacts are already
scoped to a workflow run, so the matrix parameters alone provide
sufficient uniqueness.

Ref: https://github.com/bootc-dev/infra/issues/143
Assisted-by: OpenCode (Claude Opus 4)
Signed-off-by: Colin Walters <walters@verbum.org>
---
 .github/workflows/ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b3e98b827..57d6f0850 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,7 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
+  merge_group:
   workflow_dispatch: {}
 
 env:
@@ -251,7 +252,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v7
         with:
-          name: "tmt-log-PR-${{ github.event.number }}-\
+          name: "tmt-log-\
             ${{ matrix.test_os }}-\
             ${{ matrix.variant }}-\
             ${{ matrix.bootloader }}-\
@@ -304,7 +305,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v7
         with:
-          name: "tmt-log-PR-${{ github.event.number }}-${{ matrix.test_os }}-${{ matrix.variant }}-upgrade-${{ env.ARCH }}"
+          name: "tmt-log-${{ matrix.test_os }}-${{ matrix.variant }}-upgrade-${{ env.ARCH }}"
           path: /var/tmp/tmt
 
   # Test bootc install on Fedora CoreOS (separate job to avoid disk space issues
@@ -350,7 +351,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v7
         with:
-          name: tmt-log-PR-${{ github.event.number }}-fedora-43-coreos-${{ env.ARCH }}
+          name: tmt-log-fedora-43-coreos-${{ env.ARCH }}
           path: /var/tmp/tmt
 
   # Test the container export -> Anaconda liveimg install path.