tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 23:54:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

BaseTools/CodeQl: Give preference to Plugin settings

Browse Source 
For the CodeQl `AuditOnly` flag,
prioritize Plugin settings over global settings.

This patch adjusts the logic for the global `AuditOnly` setting,
placing it before the Plugin setting code.
This ensures that Plugin settings take precedence over global settings.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Joey Vagedes <joey.vagedes@gmail.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Abdul Lateef Attar <AbdulLateef.Attar@amd.com>
This commit is contained in:
Abdul Lateef Attar 2024-09-30 06:50:13 +00:00 committed by mergify[bot]
parent 06da7daab1
commit fd619ec460
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BaseTools/Plugin/CodeQL/CodeQlAnalyzePlugin.py
View File

@ -3,6 +3,7 @@
# A build plugin that analyzes a CodeQL database. # A build plugin that analyzes a CodeQL database.
# #
# Copyright (c) Microsoft Corporation. All rights reserved. # Copyright (c) Microsoft Corporation. All rights reserved.
# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
## ##
@ -78,6 +79,11 @@ class CodeQlAnalyzePlugin(IUefiBuildPlugin):
# Packages are allowed to specify package-specific query specifiers # Packages are allowed to specify package-specific query specifiers
# in the package CI YAML file that override the global query specifier. # in the package CI YAML file that override the global query specifier.
audit_only = False audit_only = False
global_audit_only = builder.env.GetValue("STUART_CODEQL_AUDIT_ONLY")
if global_audit_only:
if global_audit_only.strip().lower() == "true":
audit_only = True
query_specifiers = None query_specifiers = None
package_config_file = Path(os.path.join( package_config_file = Path(os.path.join(
self.package_path, self.package + ".ci.yaml")) self.package_path, self.package + ".ci.yaml"))
@ -94,11 +100,6 @@ class CodeQlAnalyzePlugin(IUefiBuildPlugin):
f"{str(package_config_file)}") f"{str(package_config_file)}")
query_specifiers = plugin_data["QuerySpecifiers"] query_specifiers = plugin_data["QuerySpecifiers"]
global_audit_only = builder.env.GetValue("STUART_CODEQL_AUDIT_ONLY")
if global_audit_only:
if global_audit_only.strip().lower() == "true":
audit_only = True
if audit_only: if audit_only:
logging.info(f"CodeQL Analyze plugin is in audit only mode for " logging.info(f"CodeQL Analyze plugin is in audit only mode for "
f"{self.package} ({self.target}).") f"{self.package} ({self.target}).")