Skip to content

Commit dd74661

Browse files
igfooigfoo
authored
Merge pull request #2746 from github/update-v3.28.8-a91a3f767
Merge main into releases/v3
2 parents 6e54559 + 3210a3c commit dd74661

File tree

7 files changed

+23
-5
lines changed

7 files changed

+23
-5
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

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

5+
## 3.28.8 - 29 Jan 2025
6+
7+
- Enable support for Kotlin 2.1.10 when running with CodeQL CLI v2.20.3. [#2744](https://github.com/github/codeql-action/pull/2744)
8+
59
## 3.28.7 - 29 Jan 2025
610

711
No user facing changes.

‎lib/init-action.js

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/init-action.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎node_modules/.package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql",
3-
"version": "3.28.7",
3+
"version": "3.28.8",
44
"private": true,
55
"description": "CodeQL action",
66
"scripts": {

‎src/init-action.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,15 @@ async function run() {
539539
core.exportVariable("CODEQL_EXTRACTOR_JAVA_AGENT_DISABLE_KOTLIN", "true");
540540
}
541541

542+
const kotlinLimitVar =
543+
"CODEQL_EXTRACTOR_KOTLIN_OVERRIDE_MAXIMUM_VERSION_LIMIT";
544+
if (
545+
(await codeQlVersionAtLeast(codeql, "2.20.3")) &&
546+
!(await codeQlVersionAtLeast(codeql, "2.20.4"))
547+
) {
548+
core.exportVariable(kotlinLimitVar, "2.1.20");
549+
}
550+
542551
if (config.languages.includes(Language.cpp)) {
543552
const envVar = "CODEQL_EXTRACTOR_CPP_TRAP_CACHING";
544553
if (process.env[envVar]) {

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy