Skip to content

Commit af2a592

Browse files
authored
Remove support for CodeQL CLI versions older than v2.15.5 (#3681)
1 parent a4fcbd0 commit af2a592

File tree

3 files changed

+2
-18
lines changed

3 files changed

+2
-18
lines changed

extensions/ql-vscode/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1790,8 +1790,7 @@
17901790
"when": "false"
17911791
},
17921792
{
1793-
"command": "codeQL.trimCache",
1794-
"when": "codeql.supportsTrimCache"
1793+
"command": "codeQL.trimCache"
17951794
}
17961795
],
17971796
"editor/context": [

extensions/ql-vscode/src/codeql-cli/cli.ts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,14 +1755,6 @@ export class CodeQLCliServer implements Disposable {
17551755
this._versionChangedListeners.forEach((listener) =>
17561756
listener(newVersionAndFeatures),
17571757
);
1758-
// this._version is only undefined upon config change, so we reset CLI-based context key only when necessary.
1759-
await this.app.commands.execute(
1760-
"setContext",
1761-
"codeql.supportsTrimCache",
1762-
newVersionAndFeatures.version.compare(
1763-
CliVersionConstraint.CLI_VERSION_WITH_TRIM_CACHE,
1764-
) >= 0,
1765-
);
17661758
} catch (e) {
17671759
this._versionChangedListeners.forEach((listener) =>
17681760
listener(undefined),
@@ -1917,13 +1909,7 @@ function shouldDebugCliServer() {
19171909
export class CliVersionConstraint {
19181910
// The oldest version of the CLI that we support. This is used to determine
19191911
// whether to show a warning about the CLI being too old on startup.
1920-
public static OLDEST_SUPPORTED_CLI_VERSION = new SemVer("2.14.6");
1921-
1922-
/**
1923-
* CLI version where the query server supports the `evaluation/trimCache` method
1924-
* with `codeql database cleanup --mode=trim` semantics.
1925-
*/
1926-
public static CLI_VERSION_WITH_TRIM_CACHE = new SemVer("2.15.1");
1912+
public static OLDEST_SUPPORTED_CLI_VERSION = new SemVer("v2.15.5");
19271913

19281914
public static CLI_VERSION_WITHOUT_MRVA_EXTENSIBLE_PREDICATE_HACK = new SemVer(
19291915
"2.16.1",

extensions/ql-vscode/supported_cli_versions.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
"v2.17.6",
44
"v2.16.6",
55
"v2.15.5",
6-
"v2.14.6",
76
"nightly"
87
]

0 commit comments

Comments
 (0)