8000 Merge branch 'main' into update-bundle/codeql-bundle-v2.17.0 · github/codeql-action@65e69c8 · GitHub
[go: up one dir, main page]
Skip to content

Commit 65e69c8

Browse files
cklincklin
authored
Merge branch 'main' into update-bundle/codeql-bundle-v2.17.0
2 parents ec214df + 3bd9c3e commit 65e69c8

12 files changed

+55
-61
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
77
## [UNRELEASED]
88

99
- Update default CodeQL bundle version to 2.17.0. [#2219](https://github.com/github/codeql-action/pull/2219)
10+
- Add a deprecation warning for customers using CodeQL version 2.12.5 and earlier. These versions of CodeQL were discontinued on 26 March 2024 alongside GitHub Enterprise Server 3.8, and will be unsupported by CodeQL Action versions 3.25.0 and later and versions 2.25.0 and later. [#2220](https://github.com/github/codeql-action/pull/2220)
11+
- If you are using one of these versions, please update to CodeQL CLI version 2.12.6 or later. For instance, if you have specified a custom version of the CLI using the 'tools' input to the 'init' Action, you can remove this input to use the default version.
12+
- Alternatively, if you want to continue using a version of the CodeQL CLI between 2.11.6 and 2.12.5, you can replace `github/codeql-action/*@v3` by `github/codeql-action/*@v3.24.10` and `github/codeql-action/*@v2` by `github/codeql-action/*@v2.24.10` in your code scanning workflow to ensure you continue using this version of the CodeQL Action.
1013

1114
## 3.24.9 - 22 Mar 2024
1215

‎lib/api-compatibility.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "maximumVersion": "3.13", "minimumVersion": "3.8" }
1+
{ "maximumVersion": "3.13", "minimumVersion": "3.9" }

‎lib/codeql.js

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

‎lib/codeql.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.

‎lib/codeql.test.js

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

‎lib/codeql.test.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.

‎lib/tools-features.js

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

‎lib/tools-features.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.

‎src/api-compatibility.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"maximumVersion": "3.13", "minimumVersion": "3.8"}
1+
{"maximumVersion": "3.13", "minimumVersion": "3.9"}

‎src/codeql.test.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import {
2929
makeVersionInfo,
3030
createTestConfig,
3131
} from "./testing-utils";
32+
import { ToolsFeature } from "./tools-features";
3233
import * as util from "./util";
3334
import { initializeEnvironment } from "./util";
3435

@@ -772,33 +773,34 @@ test("does not pass a qlconfig to the CLI when it is undefined", async (t: Execu
772773

773774
const NEW_ANALYSIS_SUMMARY_TEST_CASES = [
774775
{
775-
codeqlVersion: "2.15.0",
776+
codeqlVersion: makeVersionInfo("2.15.0", {
777+
[ToolsFeature.AnalysisSummaryV2IsDefault]: true,
778+
}),
776779
githubVersion: {
777780
type: util.GitHubVariant.DOTCOM,
778781
},
779-
flagPassed: true,
782+
flagPassed: false,
780783
negativeFlagPassed: false,
781784
},
782785
{
783-
codeqlVersion: "2.15.0",
786+
codeqlVersion: makeVersionInfo("2.15.0"),
784787
githubVersion: {
785-
type: util.GitHubVariant.GHES,
786-
version: "3.9.0",
788+
type: util.GitHubVariant.DOTCOM,
787789
},
788790
flagPassed: true,
789791
negativeFlagPassed: false,
790792
},
791793
{
792-
codeqlVersion: "2.15.0",
794+
codeqlVersion: makeVersionInfo("2.15.0"),
793795
githubVersion: {
794796
type: util.GitHubVariant.GHES,
795-
version: "3.8.6",
797+
version: "3.9.0",
796798
},
797-
flagPassed: false,
798-
negativeFlagPassed: true,
799+
flagPassed: true,
800+
negativeFlagPassed: false,
799801
},
800802
{
801-
codeqlVersion: "2.14.6",
803+
codeqlVersion: makeVersionInfo("2.14.6"),
802804
githubVersion: {
803805
type: util.GitHubVariant.DOTCOM,
804806
},
@@ -819,14 +821,12 @@ for (const {
819821
: negativeFlagPassed
820822
? "--no-new-analysis-summary"
821823
: "nothing"
822-
} for CodeQL CLI v${codeqlVersion} and ${
824+
} for CodeQL version ${JSON.stringify(codeqlVersion)} and ${
823825
util.GitHubVariant[githubVersion.type]
824826
} ${githubVersion.version ? ` ${githubVersion.version}` : ""}`, async (t) => {
825827
const runnerConstructorStub = stubToolRunnerConstructor();
826828
const codeqlObject = await codeql.getCodeQLForTesting();
827-
sinon
828-
.stub(codeqlObject, "getVersion")
829-
.resolves(makeVersionInfo(codeqlVersion));
829+
sinon.stub(codeqlObject, "getVersion").resolves(codeqlVersion);
830830
// safeWhich throws because of the test CodeQL object.
831831
sinon.stub(safeWhich, "safeWhich").resolves("");
832832
await codeqlObject.databaseInterpretResults(

0 commit comments

Comments
 (0)
0