From a770cc11283ba63f6fe748582ccbe796e91c6e96 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 2 Feb 2026 16:45:36 -0500 Subject: [PATCH] ci(build+codeql): run for merge groups Signed-off-by: Seth Flynn --- .github/workflows/build.yml | 29 ++--------------------------- .github/workflows/codeql.yml | 29 ++--------------------------- 2 files changed, 4 insertions(+), 54 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d56bb661..f2b252075 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,33 +5,8 @@ concurrency: cancel-in-progress: true on: - push: - branches: - - "develop" - - "release-*" - paths: - # File types - - "**.cpp" - - "**.h" - - "**.java" - - "**.ui" - - # Directories - - "buildconfig/**" - - "cmake/**" - - "launcher/**" - - "libraries/**" - - "program_info/**" - - "tests/**" - - # Files - - "CMakeLists.txt" - - "COPYING.md" - - # Workflows - - ".github/workflows/build.yml" - - ".github/actions/package/**" - - ".github/actions/setup-dependencies/**" + merge_group: + types: [checks_requested] pull_request: paths: # File types diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e4830ddd9..b8468f70e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -5,33 +5,8 @@ concurrency: cancel-in-progress: true on: - push: - branches: - - "develop" - - "release-*" - paths: - # File types - - "**.cpp" - - "**.h" - - "**.java" - - "**.ui" - - # Directories - - "buildconfig/**" - - "cmake/**" - - "launcher/**" - - "libraries/**" - - "program_info/**" - - "tests/**" - - # Files - - "CMakeLists.txt" - - "COPYING.md" - - # Workflows - - ".github/codeql/**" - - ".github/workflows/codeql.yml" - - ".github/actions/setup-dependencies/**" + merge_group: + types: [checks_requested] pull_request: paths: # File types