Skip to content

Allow using new CodeQL languages without updating the CodeQL Action #2914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henrymercer merged 15 commits into from
Aug 6, 2025
Merged

Allow using new CodeQL languages without updating the CodeQL Action #2914

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3b57965
Remove per-language hardcoded traced/scanned info
henrymercer May 30, 2025
fa0b6ff
Clarify meaning of `Language` enum
henrymercer May 30, 2025
e303175
Use CodeQL CLI to parse languages
henrymercer May 30, 2025
932be8f
Rename `Language` enum and use generic `Language` where possible
henrymercer May 30, 2025
1d22e83
Rust: Set experimental features variable before language parsing
henrymercer May 30, 2025
a28197c
Fix early return for no autobuild languages
henrymercer May 30, 2025
c481481
Merge branch 'main' into henrymercer/language-extensibility
henrymercer Aug 5, 2025
cfb8d07
Remove unnecessary String initializations
henrymercer Aug 5, 2025
83e92ed
Improve detection of Rust in languages input
henrymercer Aug 5, 2025
bf692c0
Merge branch 'main' into henrymercer/language-extensibility
henrymercer Aug 5, 2025
fa18cc9
Improve docstrings for language types
henrymercer Aug 5, 2025
e682065
Fix docstring in start-proxy
henrymercer Aug 5, 2025
ea05bf2
Use more explicit checks on `.length` for readability
henrymercer Aug 5, 2025
377976a
Improve type of `trapCaches` now `Language` is non-exhaustive
henrymercer Aug 5, 2025
f30d00f
Update `Language` doc
henrymercer Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve detection of Rust in languages input
  • Loading branch information
@henrymercer
henrymercer committed Aug 5, 2025
commit 83e92edc4b4bba4e3be47858adee3f94fa23d012
13 changes: 8 additions & 5 deletions lib/config-utils.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/config-utils.js.map
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions lib/init-action.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/init-action.js.map
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 10 additions & 5 deletions src/config-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,15 @@ export async function getLanguages(
return languages;
}

export function getRawLanguagesNoAutodetect(
languagesInput: string | undefined,
): string[] {
return (languagesInput || "")
.split(",")
.map((x) => x.trim().toLowerCase())
.filter((x) => x.length > 0);
}

Copilot AI Aug 5, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function duplicates logic that was previously inline in getRawLanguages. Consider extracting this to a shared utility function to avoid code duplication and improve maintainability.

Copilot uses AI. Check for mistakes.

/**
* Gets the set of languages in the current repository without checking to
* see if these languages are actually supported by CodeQL.
Expand All @@ -416,12 +425,8 @@ export async function getRawLanguages(
rawLanguages: string[];
autodetected: boolean;
}> {
// Obtain from action input 'languages' if set
const languagesFromInput = (languagesInput || "")
.split(",")
.map((x) => x.trim().toLowerCase())
.filter((x) => x.length > 0);
// If the user has specified languages, use those.
const languagesFromInput = getRawLanguagesNoAutodetect(languagesInput);
if (languagesFromInput.length) {
Comment thread
mbg marked this conversation as resolved.
Outdated
return { rawLanguages: languagesFromInput, autodetected: false };
}
Expand Down
12 changes: 10 additions & 2 deletions src/init-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,16 @@ async function run() {
}
core.endGroup();

// Set CODEQL_ENABLE_EXPERIMENTAL_FEATURES for rust
if (getOptionalInput("languages")?.includes(KnownLanguage.rust)) {
// Set CODEQL_ENABLE_EXPERIMENTAL_FEATURES for Rust. We need to set this environment
// variable before initializing the config, otherwise Rust analysis will not be
// enabled.
if (
// Only enable Rust analysis if the user has explicitly requested it - don't
// enable it via language autodetection.
configUtils
.getRawLanguagesNoAutodetect(getOptionalInput("languages"))
.includes(KnownLanguage.rust)
) {
const feat = Feature.RustAnalysis;
const minVer = featureConfig[feat].minimumVersion as string;
const envVar = "CODEQL_ENABLE_EXPERIMENTAL_FEATURES";
Expand Down