Skip to content

Commit fbb8ff6

Browse files
authored
.sync/workflows/leaf/codeql.yml: Update CodeQL plugin from .pytool to BaseTools (#299)
The CodeQL plugin moved from .pytool to BaseTools in the Mu Basecore 202311 update. This change first looks for the plugin in BaseTools and falls back to the prior .pytool location if it is not found for backward compatibility with some earlier release branches that have not picked up the change. Eventually, the .pytool fallback can be removed. --- Issue to track removal of the fallback: #300 Signed-off-by: Michael Kubacki <[email protected]>
1 parent dc54ac0 commit fbb8ff6

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.sync/workflows/leaf/codeql-platform.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,9 @@ jobs:
324324
from pathlib import Path
325325
326326
# Find the plugin directory that contains the CodeQL plugin
327-
plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('.pytool/Plugin/CodeQL'))
327+
plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('BaseTools/Plugin/CodeQL'))
328+
if not plugin_dir:
329+
plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('.pytool/Plugin/CodeQL'))
328330
329331
# This should only be found once
330332
if len(plugin_dir) == 1:

.sync/workflows/leaf/codeql.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,9 @@ jobs:
271271
from pathlib import Path
272272
273273
# Find the plugin directory that contains the CodeQL plugin
274-
plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('.pytool/Plugin/CodeQL'))
274+
plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('BaseTools/Plugin/CodeQL'))
275+
if not plugin_dir:
276+
plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('.pytool/Plugin/CodeQL'))
275277
276278
# This should only be found once
277279
if len(plugin_dir) == 1:

0 commit comments

Comments
 (0)