Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc43362b

Browse files
authored
Merge pull request#3340 from github/kaspersv/check-for-overlayBaseSpecifier
Overlay: Check database metadata for overlayBaseSpecifier
2 parents149d184 +002a7f2 commitc43362b

12 files changed

+291
-11
lines changed

‎lib/analyze-action-post.js‎

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

‎lib/analyze-action.js‎

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

‎lib/autobuild-action.js‎

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

‎lib/init-action-post.js‎

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

‎lib/init-action.js‎

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

‎lib/resolve-environment-action.js‎

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

‎lib/setup-codeql-action.js‎

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

‎lib/upload-lib.js‎

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

‎lib/upload-sarif-action.js‎

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

‎src/codeql.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ export interface CodeQL {
206206
* Run 'codeql resolve queries --format=startingpacks'.
207207
*/
208208
resolveQueriesStartingPacks(queries:string[]):Promise<string[]>;
209+
resolveDatabase(databasePath:string):Promise<ResolveDatabaseOutput>;
209210
/**
210211
* Run 'codeql github merge-results'.
211212
*/
@@ -230,6 +231,10 @@ export interface VersionInfo {
230231
overlayVersion?:number;
231232
}
232233

234+
exportinterfaceResolveDatabaseOutput{
235+
overlayBaseSpecifier?:string;
236+
}
237+
233238
exportinterfaceResolveLanguagesOutput{
234239
[language:string]:[string];
235240
}
@@ -493,6 +498,7 @@ export function createStubCodeQL(partialCodeql: Partial<CodeQL>): CodeQL {
493498
partialCodeql,
494499
"resolveQueriesStartingPacks",
495500
),
501+
resolveDatabase:resolveFunction(partialCodeql,"resolveDatabase"),
496502
mergeResults:resolveFunction(partialCodeql,"mergeResults"),
497503
};
498504
}
@@ -1003,6 +1009,26 @@ async function getCodeQLForCmd(
10031009
);
10041010
}
10051011
},
1012+
asyncresolveDatabase(
1013+
databasePath:string,
1014+
):Promise<ResolveDatabaseOutput>{
1015+
constcodeqlArgs=[
1016+
"resolve",
1017+
"database",
1018+
databasePath,
1019+
"--format=json",
1020+
...getExtraOptionsFromEnv(["resolve","database"]),
1021+
];
1022+
constoutput=awaitrunCli(cmd,codeqlArgs,{noStreamStdout:true});
1023+
1024+
try{
1025+
returnJSON.parse(output)asResolveDatabaseOutput;
1026+
}catch(e){
1027+
thrownewError(
1028+
`Unexpected output from codeql resolve database --format=json:${e}`,
1029+
);
1030+
}
1031+
},
10061032
asyncmergeResults(
10071033
sarifFiles:string[],
10081034
outputFile:string,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp