Run CodeQL with linked tools for merge queue

mbg · mbg · commit 4e8e79431d43 · 2026-02-26T18:25:26.000Z
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -66,7 +66,7 @@ jobs:
         #
         # If we're running on push or schedule, then we can skip running with `tools: linked` when it would be
         # the same as running with `tools: null`.
-        if [[ "$GITHUB_EVENT_NAME" != "pull_request" && "$CODEQL_VERSION_DEFAULT" == "$CODEQL_VERSION_LATEST" ]]; then
+        if [[ "$GITHUB_EVENT_NAME" != "pull_request" && "$GITHUB_EVENT_NAME" != "merge_group" && "$CODEQL_VERSION_DEFAULT" == "$CODEQL_VERSION_LATEST" ]]; then
           VERSIONS_JSON='[null]'
         else
           VERSIONS_JSON='[null, "linked"]'

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ jobs:`
`66`	`66`	`#`
`67`	`67`	# If we're running on push or schedule, then we can skip running with `tools: linked` when it would be
`68`	`68`	# the same as running with `tools: null`.
`69`		`- if [[ "$GITHUB_EVENT_NAME" != "pull_request" && "$CODEQL_VERSION_DEFAULT" == "$CODEQL_VERSION_LATEST" ]]; then`
	`69`	`+ if [[ "$GITHUB_EVENT_NAME" != "pull_request" && "$GITHUB_EVENT_NAME" != "merge_group" && "$CODEQL_VERSION_DEFAULT" == "$CODEQL_VERSION_LATEST" ]]; then`
`70`	`70`	`VERSIONS_JSON='[null]'`
`71`	`71`	`else`
`72`	`72`	`VERSIONS_JSON='[null, "linked"]'`