From d8533821ba56a525ae10dd8f6f4458374aa9471d Mon Sep 17 00:00:00 2001 From: "Project Mu UEFI Bot [bot]" <45776386+uefibot@users.noreply.github.com> Date: Tue, 23 Jan 2024 13:53:36 -0500 Subject: [PATCH] Repo File Sync: Support CodeQL Plugin in BaseTools (#186) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit synced local file(s) with [microsoft/mu_devops](https://github.com/microsoft/mu_devops). 🤖: View the [Repo File Sync Configuration File](https://github.com/microsoft/mu_devops/blob/main/.sync/Files.yml) to see how files are synced. --- This PR was created automatically by the [repo-file-sync-action](https://github.com/BetaHuhn/repo-file-sync-action) workflow run [#7629520553](https://github.com/microsoft/mu_devops/actions/runs/7629520553) Signed-off-by: Project Mu UEFI Bot --- .github/workflows/codeql.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a5b5b7f..fd6c928 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -178,7 +178,7 @@ jobs: - name: Attempt to Load cargo-make From Cache id: cargo_make_cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.get_cargo_tool_details.outputs.cargo_bin_path }} key: ${{ steps.get_cargo_tool_details.outputs.cargo_make_cache_key }} @@ -271,7 +271,9 @@ jobs: from pathlib import Path # Find the plugin directory that contains the CodeQL plugin - plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('.pytool/Plugin/CodeQL')) + plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('BaseTools/Plugin/CodeQL')) + if not plugin_dir: + plugin_dir = list(Path(os.environ['GITHUB_WORKSPACE']).rglob('.pytool/Plugin/CodeQL')) # This should only be found once if len(plugin_dir) == 1: @@ -310,7 +312,7 @@ jobs: - name: Attempt to Load CodeQL CLI From Cache id: codeqlcli_cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.cache_key_gen.outputs.codeql_cli_ext_dep_dir }} key: ${{ steps.cache_key_gen.outputs.codeql_cli_cache_key }}