Keep user-provided query filters first

This commit is contained in:
Chuan-kai Lin 2025-06-19 11:48:20 -07:00
parent f5304e7bf5
commit 0b8d151adc
2 changed files with 6 additions and 2 deletions

View file

@ -4,7 +4,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
## [UNRELEASED]
No user facing changes.
- Fix bug in PR analysis where user-provided `include` query filter fails to exclude non-included queries. [#2938](https://github.com/github/codeql-action/pull/2938)
## 3.29.0 - 11 Jun 2025

View file

@ -1266,8 +1266,12 @@ async function generateCodeScanningConfig(
}
augmentedConfig["query-filters"] = [
...(config.augmentationProperties.extraQueryExclusions || []),
// Ordering matters. If the first filter is an inclusion, it implicitly
// excludes all queries that are not included. If it is an exclusion,
// it implicitly includes all queries that are not excluded. So user
// filters (if any) should always be first to preserve intent.
...(augmentedConfig["query-filters"] || []),
...(config.augmentationProperties.extraQueryExclusions || []),
];
if (augmentedConfig["query-filters"]?.length === 0) {
delete augmentedConfig["query-filters"];