From 93f0330bc0d028d1e6b6db80665db7d16946ab96 Mon Sep 17 00:00:00 2001 From: Eric Kerfoot <17726042+ericspod@users.noreply.github.com> Date: Wed, 8 Jul 2026 19:13:31 -0400 Subject: [PATCH 1/2] Adding Merge Queue Support Signed-off-by: Eric Kerfoot <17726042+ericspod@users.noreply.github.com> --- .github/workflows/build_docs.yml | 2 ++ .github/workflows/cicd_tests.yml | 2 ++ .github/workflows/codeql-analysis.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index a9637c2716..1d426d94f4 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -11,6 +11,8 @@ on: - dev - main - releasing/* + merge_group: # needed for merge queue + types: [checks_requested] concurrency: # automatically cancel the previously triggered workflows when there's a newer version diff --git a/.github/workflows/cicd_tests.yml b/.github/workflows/cicd_tests.yml index e371dac76e..e45ac18de8 100644 --- a/.github/workflows/cicd_tests.yml +++ b/.github/workflows/cicd_tests.yml @@ -20,6 +20,8 @@ on: - '**.md' - '**.rst' - 'docs/**' + merge_group: # needed for merge queue + types: [checks_requested] concurrency: # automatically cancel the previously triggered workflows when there's a newer version diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3b4b427c99..7455ba21a9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -17,6 +17,8 @@ on: pull_request: # The branches below must be a subset of the branches above branches: [ dev ] + merge_group: # needed for merge queue + types: [checks_requested] schedule: - cron: '18 1 * * 0' From 8f8fa8f503c442c4ab4e16a939da0bd858ede7d3 Mon Sep 17 00:00:00 2001 From: Eric Kerfoot <17726042+ericspod@users.noreply.github.com> Date: Thu, 27 Aug 2026 23:59:59 +0100 Subject: [PATCH 2/2] Remove paths-ignore Signed-off-by: Eric Kerfoot <17726042+ericspod@users.noreply.github.com> --- .github/workflows/cicd_tests.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/cicd_tests.yml b/.github/workflows/cicd_tests.yml index d7e16516e9..3ddd1b645c 100644 --- a/.github/workflows/cicd_tests.yml +++ b/.github/workflows/cicd_tests.yml @@ -7,19 +7,11 @@ on: - dev - main - releasing/* - paths-ignore: # skip if only docs are modified - - '**.md' - - '**.rst' - - 'docs/**' pull_request: branches: - dev - main - releasing/* - paths-ignore: # skip if only docs are modified - - '**.md' - - '**.rst' - - 'docs/**' merge_group: # needed for merge queue types: [checks_requested]