Skip to content

Commit 61a2883

Browse files
committed
ci: Enable merge_group trigger for merge queue support
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: bootc-dev/infra#143 Assisted-by: OpenCode (Claude Opus 4) Signed-off-by: Colin Walters <walters@verbum.org>
1 parent 8ef2ae9 commit 61a2883

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
branches: [main]
1717
pull_request:
1818
branches: [main]
19+
merge_group:
1920
workflow_dispatch: {}
2021

2122
env:
@@ -251,7 +252,7 @@ jobs:
251252
if: always()
252253
uses: actions/upload-artifact@v7
253254
with:
254-
name: "tmt-log-PR-${{ github.event.number }}-\
255+
name: "tmt-log-\
255256
${{ matrix.test_os }}-\
256257
${{ matrix.variant }}-\
257258
${{ matrix.bootloader }}-\
@@ -304,7 +305,7 @@ jobs:
304305
if: always()
305306
uses: actions/upload-artifact@v7
306307
with:
307-
name: "tmt-log-PR-${{ github.event.number }}-${{ matrix.test_os }}-${{ matrix.variant }}-upgrade-${{ env.ARCH }}"
308+
name: "tmt-log-${{ matrix.test_os }}-${{ matrix.variant }}-upgrade-${{ env.ARCH }}"
308309
path: /var/tmp/tmt
309310

310311
# Test bootc install on Fedora CoreOS (separate job to avoid disk space issues
@@ -346,7 +347,7 @@ jobs:
346347
if: always()
347348
uses: actions/upload-artifact@v7
348349
with:
349-
name: tmt-log-PR-${{ github.event.number }}-fedora-43-coreos-${{ env.ARCH }}
350+
name: tmt-log-fedora-43-coreos-${{ env.ARCH }}
350351
path: /var/tmp/tmt
351352

352353
# Test the container export -> Anaconda liveimg install path.

0 commit comments

Comments
 (0)