robojerk/codeql-action

Merge pull request #2788 from github/dbartol/use-real-actions-extractor

Browse source 
Use embedded `actions` extractor only for old CLI versions
This commit is contained in:
Dave Bartolomeo 2025-03-03 13:59:30 -05:00 • committed by GitHub
commit 80f9930395
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/codeql.js generated
View file

@ -262,9 +262,17 @@ async function getCodeQLForCmd(cmd, checkVersion) {
extraArgs.push(`--trace-process-name=${processName}`); extraArgs.push(`--trace-process-name=${processName}`);
} }
if (config.languages.indexOf(languages_1.Language.actions) >= 0) { if (config.languages.indexOf(languages_1.Language.actions) >= 0) {
extraArgs.push("--search-path"); // We originally added an embedded version of the Actions extractor to the CodeQL Action
const extractorPath = path.resolve(__dirname, "../actions-extractor"); // itself in order to deploy the extractor between CodeQL releases. When we did add the
extraArgs.push(extractorPath); // extractor to the CLI, though, its autobuild script was missing the execute bit.
// 2.20.6 is the first CLI release with the fully-functional extractor in the CLI. For older
// versions, we'll keep using the embedded extractor. We can remove the embedded extractor
// once 2.20.6 is deployed in the runner images.
if (!(await util.codeQlVersionAtLeast(codeql, "2.20.6"))) {
extraArgs.push("--search-path");
const extractorPath = path.resolve(__dirname, "../actions-extractor");
extraArgs.push(extractorPath);
}
} }
const codeScanningConfigFile = await generateCodeScanningConfig(config, logger); const codeScanningConfigFile = await generateCodeScanningConfig(config, logger);
const externalRepositoryToken = (0, actions_util_1.getOptionalInput)("external-repository-token"); const externalRepositoryToken = (0, actions_util_1.getOptionalInput)("external-repository-token");

2
lib/codeql.js.map
View file

File diff suppressed because one or more lines are too long

14
src/codeql.ts
View file

@ -564,9 +564,17 @@ export async function getCodeQLForCmd(
} }
if (config.languages.indexOf(Language.actions) >= 0) { if (config.languages.indexOf(Language.actions) >= 0) {
extraArgs.push("--search-path"); // We originally added an embedded version of the Actions extractor to the CodeQL Action
const extractorPath = path.resolve(__dirname, "../actions-extractor"); // itself in order to deploy the extractor between CodeQL releases. When we did add the
extraArgs.push(extractorPath); // extractor to the CLI, though, its autobuild script was missing the execute bit.
// 2.20.6 is the first CLI release with the fully-functional extractor in the CLI. For older
// versions, we'll keep using the embedded extractor. We can remove the embedded extractor
// once 2.20.6 is deployed in the runner images.
if (!(await util.codeQlVersionAtLeast(codeql, "2.20.6"))) {
extraArgs.push("--search-path");
const extractorPath = path.resolve(__dirname, "../actions-extractor");
extraArgs.push(extractorPath);
}
} }
const codeScanningConfigFile = await generateCodeScanningConfig( const codeScanningConfigFile = await generateCodeScanningConfig(