Skip to content

Merge main into releases/v3 #2746

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
merged 9 commits into from
Jan 29, 2025
Merged

Merge main into releases/v3 #2746

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bcf5cec
Update changelog and version after v3.28.7
github-actions[bot] Jan 29, 2025
163d119
Update checked-in dependencies
github-actions[bot] Jan 29, 2025
5a61bf0
Kotlin: The 2.20.3 release supports Kotlin 2.1.10.
igfoo Jan 29, 2025
0c21937
Run "npm run build"
igfoo Jan 29, 2025
3879c57
Add changelog entry
igfoo Jan 29, 2025
c520fb5
Merge pull request #2745 from github/mergeback/v3.28.7-to-main-6e545590
marcogario Jan 29, 2025
a91a3f7
Merge pull request #2744 from github/igfoo/kot2.1.10
igfoo Jan 29, 2025
72f9d02
Update changelog for v3.28.8
github-actions[bot] Jan 29, 2025
3210a3c
Fix Kotlin version in changelog
igfoo Jan 29, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs.

## 3.28.8 - 29 Jan 2025

- Enable support for Kotlin 2.1.20 when running with CodeQL CLI v2.20.3. [#2744](https://github.com/github/codeql-action/pull/2744)

## 3.28.7 - 29 Jan 2025

No user facing changes.
Expand Down
5 changes: 5 additions & 0 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.

2 changes: 1 addition & 1 deletion node_modules/.package-lock.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions package-lock.json
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codeql",
"version": "3.28.7",
"version": "3.28.8",
"private": true,
"description": "CodeQL action",
"scripts": {
Expand Down
9 changes: 9 additions & 0 deletions src/init-action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,15 @@ async function run() {
core.exportVariable("CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN", "true");
}

const kotlinLimitVar =
"CODEQL_EXTRACTOR_KOTLIN_OVERRIDE_MAXIMUM_VERSION_LIMIT";
if (
(await codeQlVersionAtLeast(codeql, "2.20.3")) &&
!(await codeQlVersionAtLeast(codeql, "2.20.4"))
) {
core.exportVariable(kotlinLimitVar, "2.1.20");
}

if (config.languages.includes(Language.cpp)) {
const envVar = "CODEQL_EXTRACTOR_CPP_TRAP_CACHING";
if (process.env[envVar]) {
Expand Down
Loading