From 60599408e44b8b49421b7c60c1f8bb4e1abedbd0 Mon Sep 17 00:00:00 2001 From: Arthur Baars Date: Mon, 23 Jun 2025 08:05:29 +0000 Subject: [PATCH] CodeQL: install platform specific CodeQL bundle This should reduce the size of the CodeQL bundle by only including the platform specific CodeQL CLI and libraries, rather than the full set of CodeQL CLI and libraries for all platforms. --- images/macos/scripts/build/install-codeql-bundle.sh | 2 +- images/ubuntu/scripts/build/install-codeql-bundle.sh | 2 +- images/windows/scripts/build/Install-CodeQLBundle.ps1 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/scripts/build/install-codeql-bundle.sh b/images/macos/scripts/build/install-codeql-bundle.sh index f1d70a121..d07eae9af 100644 --- a/images/macos/scripts/build/install-codeql-bundle.sh +++ b/images/macos/scripts/build/install-codeql-bundle.sh @@ -30,7 +30,7 @@ bundle_tag_name="codeql-bundle-v$bundle_version" echo "Downloading CodeQL bundle $bundle_version..." # Note that this is the all-platforms CodeQL bundle, to support scenarios where customers run # different operating systems within containers. -archive_path=$(download_with_retry "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz") +archive_path=$(download_with_retry "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle-osx64.tar.gz") codeql_toolcache_path=$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64 mkdir -p "$codeql_toolcache_path" diff --git a/images/ubuntu/scripts/build/install-codeql-bundle.sh b/images/ubuntu/scripts/build/install-codeql-bundle.sh index 37bd92765..ea8837262 100644 --- a/images/ubuntu/scripts/build/install-codeql-bundle.sh +++ b/images/ubuntu/scripts/build/install-codeql-bundle.sh @@ -30,7 +30,7 @@ bundle_tag_name="codeql-bundle-v$bundle_version" echo "Downloading CodeQL bundle $bundle_version..." # Note that this is the all-platforms CodeQL bundle, to support scenarios where customers run # different operating systems within containers. -codeql_archive=$(download_with_retry "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz") +codeql_archive=$(download_with_retry "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle-linux64.tar.gz") codeql_toolcache_path="$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64" mkdir -p "$codeql_toolcache_path" diff --git a/images/windows/scripts/build/Install-CodeQLBundle.ps1 b/images/windows/scripts/build/Install-CodeQLBundle.ps1 index 7761a9b5c..dff5de218 100644 --- a/images/windows/scripts/build/Install-CodeQLBundle.ps1 +++ b/images/windows/scripts/build/Install-CodeQLBundle.ps1 @@ -31,7 +31,7 @@ $tagName = "codeql-bundle-v" + $cliVersion Write-Host "Downloading CodeQL bundle $($cliVersion)..." # Note that this is the all-platforms CodeQL bundle, to support scenarios where customers run # different operating systems within containers. -$codeQLBundlePath = Invoke-DownloadWithRetry "https://github.com/github/codeql-action/releases/download/$($tagName)/codeql-bundle.tar.gz" +$codeQLBundlePath = Invoke-DownloadWithRetry "https://github.com/github/codeql-action/releases/download/$($tagName)/codeql-bundle-win64.tar.gz" $downloadDirectoryPath = (Get-Item $codeQLBundlePath).Directory.FullName $codeQLToolcachePath = Join-Path $env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath $cliVersion | Join-Path -ChildPath "x64" @@ -39,7 +39,7 @@ New-Item -Path $codeQLToolcachePath -ItemType Directory -Force | Out-Null Write-Host "Unpacking the downloaded CodeQL bundle archive..." Expand-7ZipArchive -Path $codeQLBundlePath -DestinationPath $downloadDirectoryPath -$unGzipedCodeQLBundlePath = Join-Path $downloadDirectoryPath "codeql-bundle.tar" +$unGzipedCodeQLBundlePath = Join-Path $downloadDirectoryPath "codeql-bundle-win64.tar" Expand-7ZipArchive -Path $unGzipedCodeQLBundlePath -DestinationPath $codeQLToolcachePath Write-Host "CodeQL bundle at $($codeQLToolcachePath) contains the following directories:"