From aa06cf89abce6f5ffe81691623ac0beb5d2e30d4 Mon Sep 17 00:00:00 2001 From: Peter Holloway Date: Fri, 17 Apr 2026 10:32:18 +0100 Subject: [PATCH] Include merge_group in CI triggers Support using merge queues to simplify merging multiple PRs without requiring rebases between merges. --- .github/workflows/ci.yml | 3 ++- .github/workflows/publish.yaml | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa57006..bdcf261 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: branches: - main pull_request: + merge_group: env: CARGO_TERM_COLOR: always @@ -75,7 +76,7 @@ jobs: - name: Install cargo-llvm-cov uses: taiki-e/install-action@cargo-llvm-cov - + - name: Run tests and generate code coverage run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 8624cff..4fa2d75 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -10,6 +10,8 @@ on: - main # but all PRs pull_request: + # ...including once put on a merge queue + merge_group: jobs: build: @@ -85,4 +87,4 @@ jobs: helm package helm/numtracker --version ${STEPS_META_OUTPUTS_VERSION} --app-version ${STEPS_META_OUTPUTS_VERSION} -d /tmp/ helm push /tmp/numtracker-${STEPS_META_OUTPUTS_VERSION}.tgz oci://ghcr.io/diamondlightsource/charts env: - STEPS_META_OUTPUTS_VERSION: ${{ steps.meta.outputs.version }} \ No newline at end of file + STEPS_META_OUTPUTS_VERSION: ${{ steps.meta.outputs.version }}