From 734316abb40c803bb0cabe811513e98bc366954b Mon Sep 17 00:00:00 2001 From: uefibot Date: Tue, 23 Jan 2024 17:26:54 +0000 Subject: [PATCH] Repo File Sync: synced file(s) with microsoft/mu_devops 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 }}