From 489516c0b0051687e06f187454f7a775656d805f Mon Sep 17 00:00:00 2001 From: Nick Rolfe Date: Thu, 9 Oct 2025 11:00:19 +0100 Subject: [PATCH 1/2] Test commit; do not merge --- lib/analyze-action-post.js | 4 ++-- lib/analyze-action.js | 4 ++-- lib/autobuild-action.js | 4 ++-- lib/init-action-post.js | 4 ++-- lib/init-action.js | 4 ++-- lib/resolve-environment-action.js | 4 ++-- lib/upload-lib.js | 4 ++-- lib/upload-sarif-action.js | 4 ++-- src/codeql.ts | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index 19c987905e..d066e226db 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -118483,14 +118483,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const codeqlArgs = [ + const xcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/analyze-action.js b/lib/analyze-action.js index af3fb58319..76c5106110 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -93180,14 +93180,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const codeqlArgs = [ + const xcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index adf440738a..72b0197603 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -79518,14 +79518,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const codeqlArgs = [ + const xcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 08c8449012..3cb39241c8 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -131129,14 +131129,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const codeqlArgs = [ + const xcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/init-action.js b/lib/init-action.js index 5481ab1e8f..f53f129b0f 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -89941,14 +89941,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const codeqlArgs = [ + const xcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 4d1cdf81af..02ce82f694 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -79218,14 +79218,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const codeqlArgs = [ + const xcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/upload-lib.js b/lib/upload-lib.js index e7c0bb5ecd..d545475bbf 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -90963,14 +90963,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const codeqlArgs = [ + const xcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index ecdb515e3f..7d05d08024 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -91635,14 +91635,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const codeqlArgs = [ + const xcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/src/codeql.ts b/src/codeql.ts index 5241ff2476..238ac73be8 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -992,14 +992,14 @@ export async function getCodeQLForCmd( return JSON.parse(extractorPath) as string; }, async resolveQueriesStartingPacks(queries: string[]): Promise { - const codeqlArgs = [ + const xcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries, ]; - const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output) as string[]; From 12e8528a599c2858288525891cfd3d1f72c09689 Mon Sep 17 00:00:00 2001 From: Nick Rolfe Date: Thu, 9 Oct 2025 12:55:05 +0100 Subject: [PATCH 2/2] test --- lib/analyze-action-post.js | 4 ++-- lib/analyze-action.js | 4 ++-- lib/autobuild-action.js | 4 ++-- lib/init-action-post.js | 4 ++-- lib/init-action.js | 4 ++-- lib/resolve-environment-action.js | 4 ++-- lib/upload-lib.js | 4 ++-- lib/upload-sarif-action.js | 4 ++-- src/codeql.ts | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index d066e226db..713c54e25d 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -118483,14 +118483,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const xcodeqlArgs = [ + const zcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, zcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 76c5106110..b887fa9448 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -93180,14 +93180,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const xcodeqlArgs = [ + const zcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, zcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 72b0197603..6278c5492a 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -79518,14 +79518,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const xcodeqlArgs = [ + const zcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, zcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 3cb39241c8..908ad25792 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -131129,14 +131129,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const xcodeqlArgs = [ + const zcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, zcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/init-action.js b/lib/init-action.js index f53f129b0f..7f7c18fce2 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -89941,14 +89941,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const xcodeqlArgs = [ + const zcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, zcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 02ce82f694..c80948f623 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -79218,14 +79218,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const xcodeqlArgs = [ + const zcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, zcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/upload-lib.js b/lib/upload-lib.js index d545475bbf..76b38afb72 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -90963,14 +90963,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const xcodeqlArgs = [ + const zcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, zcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index 7d05d08024..592e980ba1 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -91635,14 +91635,14 @@ ${output}` return JSON.parse(extractorPath); }, async resolveQueriesStartingPacks(queries) { - const xcodeqlArgs = [ + const zcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries ]; - const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, zcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output); } catch (e) { diff --git a/src/codeql.ts b/src/codeql.ts index 238ac73be8..5fe881e14f 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -992,14 +992,14 @@ export async function getCodeQLForCmd( return JSON.parse(extractorPath) as string; }, async resolveQueriesStartingPacks(queries: string[]): Promise { - const xcodeqlArgs = [ + const zcodeqlArgs = [ "resolve", "queries", "--format=startingpacks", ...getExtraOptionsFromEnv(["resolve", "queries"]), ...queries, ]; - const output = await runCli(cmd, xcodeqlArgs, { noStreamStdout: true }); + const output = await runCli(cmd, zcodeqlArgs, { noStreamStdout: true }); try { return JSON.parse(output) as string[];