From 2dd3ce8b3088dfa5538b12796d08ec4fac285b7f Mon Sep 17 00:00:00 2001 From: Ken Lautner Date: Mon, 22 Jan 2024 11:28:09 -0800 Subject: [PATCH] Updated CISettings.py to use the edk2toolext codeql heleprs --- .pytool/CISettings.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py index a5ce754dad..a9008a54ca 100644 --- a/.pytool/CISettings.py +++ b/.pytool/CISettings.py @@ -18,14 +18,7 @@ from edk2toollib.utility_functions import GetHostInfo from pathlib import Path -try: - # May not be present until submodules are populated - root = Path(__file__).parent.parent.resolve() - sys.path.append(str(root/'MU_BASECORE'/'.pytool'/'Plugin'/'CodeQL'/'integration')) - import stuart_codeql as codeql_helpers -except ImportError: - pass - +from edk2toolext import codeql as codeql_helpers class Settings(CiSetupSettingsManager, CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManager, PrEvalSettingsManager): @@ -221,17 +214,17 @@ def GetDependencies(self): { "Path": "Common/MU_TIANO", "Url": "https://github.com/microsoft/mu_tiano_plus.git", - "Branch": "release/202311" + "Branch": "release/202302" }, { "Path": "MU_BASECORE", "Url": "https://github.com/microsoft/mu_basecore.git", - "Branch": "release/202311" + "Branch": "release/202302" }, { "Path": "Silicon/Intel/MU_TIANO", "Url": "https://github.com/microsoft/mu_silicon_intel_tiano.git", - "Branch": "release/202311" + "Branch": "release/202302" } ]