Skip to content

Commit f25c9fd

Browse files
nickrolfeaeisenberg
authored andcommitted
Use codeql.exe instead of codeql.cmd on Windows
1 parent a6043f2 commit f25c9fd

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
if: matrix.os == 'windows-latest'
8181
run: |
8282
cd extensions/ql-vscode
83-
$env:CODEQL_PATH=$(Join-Path $env:GITHUB_WORKSPACE -ChildPath 'codeql-home/codeql/codeql.cmd')
83+
$env:CODEQL_PATH=$(Join-Path $env:GITHUB_WORKSPACE -ChildPath 'codeql-home/codeql/codeql.exe')
8484
npm run test
8585
8686
- name: Run integration tests (Linux)

extensions/ql-vscode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"scope": "machine",
100100
"type": "string",
101101
"default": "",
102-
"description": "Path to the CodeQL executable that should be used by the CodeQL extension. The executable is named `codeql` on Linux/Mac and `codeql.cmd` on Windows. This overrides all other CodeQL CLI settings."
102+
"description": "Path to the CodeQL executable that should be used by the CodeQL extension. The executable is named `codeql` on Linux/Mac and `codeql.exe` on Windows. This overrides all other CodeQL CLI settings."
103103
},
104104
"codeQL.runningQueries.numberOfThreads": {
105105
"type": "integer",

extensions/ql-vscode/src/distribution.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ export function versionCompare(a: Version, b: Version): number {
502502
}
503503

504504
function codeQlLauncherName(): string {
505-
return (os.platform() === "win32") ? "codeql.cmd" : "codeql";
505+
return (os.platform() === "win32") ? "codeql.exe" : "codeql";
506506
}
507507

508508
function isRedirectStatusCode(statusCode: number): boolean {

extensions/ql-vscode/src/queryserver-client.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,8 @@ export class QueryServerClient extends DisposableObject {
184184
* The active query is used to specify the side log.
185185
*
186186
* This isn't ideal because in situations where there are queries running
187-
* in parallel, their output is interleaved, but because the activeQuery
188-
* is fixed, the previous query will have results mixed in with the active
189-
* query's side log.
190-
*
191-
* The ideal solution would be to extract the active query from the log
192-
* text received by the query server. However, that change is not
193-
* available yet.
187+
* in parallel, each query's log messages are interleaved. Fixing this
188+
* properly will require a change in the query server.
194189
*/
195190
private updateActiveQuery(method: string, parameter: any): void {
196191
if (method === messages.compileQuery.method) {

0 commit comments

Comments
 (0)