From 0c050cfbbf9812da7bfdeb4d94c30f1dffd790e1 Mon Sep 17 00:00:00 2001 From: udev Date: Wed, 1 Apr 2026 14:03:37 +0530 Subject: [PATCH] ci: add merge_group trigger to CI workflows for merge queue support (#11105) Add merge_group event trigger to all required CI workflows so they run when PRs enter the merge queue. Fix github.event.pull_request references in dispatch-event-enterprise.yml to handle merge_group context. --- .github/workflows/api-testing.yml | 3 ++- .github/workflows/db-testing.yml | 3 ++- .github/workflows/js-license-checker.yml | 3 ++- .github/workflows/playwright.yml | 3 ++- .github/workflows/unit-tests.yml | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/api-testing.yml b/.github/workflows/api-testing.yml index 15df1882c9..5fbdf42ad6 100644 --- a/.github/workflows/api-testing.yml +++ b/.github/workflows/api-testing.yml @@ -15,9 +15,10 @@ on: # - "**.md" # - "**.yml" # - "**.yaml" + merge_group: concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_ref || github.ref }} cancel-in-progress: true env: diff --git a/.github/workflows/db-testing.yml b/.github/workflows/db-testing.yml index 4a14aa3db4..bd0b37b201 100644 --- a/.github/workflows/db-testing.yml +++ b/.github/workflows/db-testing.yml @@ -7,9 +7,10 @@ on: pull_request: branches: - "*" + merge_group: concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_ref || github.ref }} cancel-in-progress: true env: diff --git a/.github/workflows/js-license-checker.yml b/.github/workflows/js-license-checker.yml index e875d72dff..6d8ddba460 100644 --- a/.github/workflows/js-license-checker.yml +++ b/.github/workflows/js-license-checker.yml @@ -15,9 +15,10 @@ on: # - "**.md" # - "**.yml" # - "**.yaml" + merge_group: concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_ref || github.ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 266ee28e1f..eda332cee1 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -15,9 +15,10 @@ on: # - "**.md" # - "**.yml" # - "**.yaml" + merge_group: concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_ref || github.ref }} cancel-in-progress: true env: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index df2b0a3f73..2ca9d986e7 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -15,9 +15,10 @@ on: # - "**.md" # - "**.yml" # - "**.yaml" + merge_group: concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_ref || github.ref }} cancel-in-progress: true env: