Address comments from PR
This commit is contained in:
parent
8f19113f88
commit
98d24e5629
5 changed files with 13 additions and 3 deletions
2
lib/codeql.js
generated
2
lib/codeql.js
generated
|
|
@ -99,7 +99,7 @@ exports.CODEQL_VERSION_BETTER_RESOLVE_LANGUAGES = "2.10.3";
|
||||||
*/
|
*/
|
||||||
exports.CODEQL_VERSION_SECURITY_EXPERIMENTAL_SUITE = "2.12.1";
|
exports.CODEQL_VERSION_SECURITY_EXPERIMENTAL_SUITE = "2.12.1";
|
||||||
/**
|
/**
|
||||||
* Versions 2.12.3+ of the CodeQL CLI support the `--qlconfig` flag in calls to `database init`.
|
* Versions 2.12.4+ of the CodeQL CLI support the `--qlconfig` flag in calls to `database init`.
|
||||||
*/
|
*/
|
||||||
exports.CODEQL_VERSION_INIT_WITH_QLCONFIG = "2.12.4";
|
exports.CODEQL_VERSION_INIT_WITH_QLCONFIG = "2.12.4";
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
3
lib/config-utils.js
generated
3
lib/config-utils.js
generated
|
|
@ -1116,6 +1116,9 @@ async function generateRegistries(registriesInput, codeQL, tempDir, logger) {
|
||||||
.map((registry) => `${registry.url}=${registry.token}`)
|
.map((registry) => `${registry.url}=${registry.token}`)
|
||||||
.join(",");
|
.join(",");
|
||||||
}
|
}
|
||||||
|
if (typeof process.env.CODEQL_REGISTRIES_AUTH === "string") {
|
||||||
|
logger.debug("Using CODEQL_REGISTRIES_AUTH environment variable to authenticate with registries.");
|
||||||
|
}
|
||||||
return {
|
return {
|
||||||
registriesAuthTokens:
|
registriesAuthTokens:
|
||||||
// if the user has explicitly set the CODEQL_REGISTRIES_AUTH env var then use that
|
// if the user has explicitly set the CODEQL_REGISTRIES_AUTH env var then use that
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -291,7 +291,7 @@ export const CODEQL_VERSION_BETTER_RESOLVE_LANGUAGES = "2.10.3";
|
||||||
export const CODEQL_VERSION_SECURITY_EXPERIMENTAL_SUITE = "2.12.1";
|
export const CODEQL_VERSION_SECURITY_EXPERIMENTAL_SUITE = "2.12.1";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Versions 2.12.3+ of the CodeQL CLI support the `--qlconfig` flag in calls to `database init`.
|
* Versions 2.12.4+ of the CodeQL CLI support the `--qlconfig` flag in calls to `database init`.
|
||||||
*/
|
*/
|
||||||
export const CODEQL_VERSION_INIT_WITH_QLCONFIG = "2.12.4";
|
export const CODEQL_VERSION_INIT_WITH_QLCONFIG = "2.12.4";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1990,6 +1990,13 @@ export async function generateRegistries(
|
||||||
.map((registry) => `${registry.url}=${registry.token}`)
|
.map((registry) => `${registry.url}=${registry.token}`)
|
||||||
.join(",");
|
.join(",");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (typeof process.env.CODEQL_REGISTRIES_AUTH === "string") {
|
||||||
|
logger.debug(
|
||||||
|
"Using CODEQL_REGISTRIES_AUTH environment variable to authenticate with registries."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
registriesAuthTokens:
|
registriesAuthTokens:
|
||||||
// if the user has explicitly set the CODEQL_REGISTRIES_AUTH env var then use that
|
// if the user has explicitly set the CODEQL_REGISTRIES_AUTH env var then use that
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue