From 5116e6ec43f193cd91ed3a4bcfe7de9e0795411e Mon Sep 17 00:00:00 2001 From: James Brunton Date: Tue, 28 Apr 2026 14:13:55 +0100 Subject: [PATCH] Set CI to run the same in the merge queue as it does in CI (#6249) --- .github/workflows/ai-engine.yml | 2 ++ .github/workflows/build-enterprise.yml | 2 ++ .github/workflows/build.yml | 2 ++ .github/workflows/dependency-review.yml | 4 +++- .github/workflows/frontend-backend-licenses-update.yml | 3 +++ .github/workflows/pre_commit.yml | 3 +++ 6 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ai-engine.yml b/.github/workflows/ai-engine.yml index 2a599b3129..75e8a46b1a 100644 --- a/.github/workflows/ai-engine.yml +++ b/.github/workflows/ai-engine.yml @@ -4,6 +4,8 @@ on: push: branches: [main] pull_request: + merge_group: + branches: [main] permissions: contents: read diff --git a/.github/workflows/build-enterprise.yml b/.github/workflows/build-enterprise.yml index 9411eca775..b20a76140a 100644 --- a/.github/workflows/build-enterprise.yml +++ b/.github/workflows/build-enterprise.yml @@ -19,6 +19,8 @@ on: branches: ["main"] pull_request: branches: ["main"] + merge_group: + branches: ["main"] schedule: - cron: "0 4 * * *" workflow_dispatch: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b24852f960..e6f5e0c31f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,6 +3,8 @@ name: Build and Test Workflow on: pull_request: branches: ["main"] + merge_group: + branches: ["main"] workflow_dispatch: # cancel in-progress jobs if a new job is triggered diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 33a456691b..fa7e1b2120 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -7,7 +7,9 @@ # # Source repository: https://github.com/actions/dependency-review-action name: "Dependency Review" -on: [pull_request] +on: + pull_request: + merge_group: permissions: contents: read diff --git a/.github/workflows/frontend-backend-licenses-update.yml b/.github/workflows/frontend-backend-licenses-update.yml index be7c0f1148..d79749c114 100644 --- a/.github/workflows/frontend-backend-licenses-update.yml +++ b/.github/workflows/frontend-backend-licenses-update.yml @@ -7,6 +7,9 @@ on: pull_request: branches: - main + merge_group: + branches: + - main concurrency: group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }} diff --git a/.github/workflows/pre_commit.yml b/.github/workflows/pre_commit.yml index 9e4d5d574f..395d85211a 100644 --- a/.github/workflows/pre_commit.yml +++ b/.github/workflows/pre_commit.yml @@ -5,6 +5,9 @@ on: pull_request: branches: - main + merge_group: + branches: + - main permissions: contents: read