Merge branch 'main' into update-supported-enterprise-server-versions
This commit is contained in:
commit
04b73050b2
6 changed files with 61 additions and 6 deletions
|
|
@ -587,8 +587,11 @@ async function run() {
|
|||
core.exportVariable(bmnVar, value);
|
||||
}
|
||||
|
||||
// Set CODEQL_ENABLE_EXPERIMENTAL_FEATURES for rust
|
||||
if (config.languages.includes(Language.rust)) {
|
||||
// For rust: set CODEQL_ENABLE_EXPERIMENTAL_FEATURES, unless codeql already supports rust without it
|
||||
if (
|
||||
config.languages.includes(Language.rust) &&
|
||||
!(await codeql.resolveLanguages()).rust
|
||||
) {
|
||||
const feat = Feature.RustAnalysis;
|
||||
const minVer = featureConfig[feat].minimumVersion as string;
|
||||
const envVar = "CODEQL_ENABLE_EXPERIMENTAL_FEATURES";
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
import * as core from "@actions/core";
|
||||
|
||||
import { parseLanguage, Language } from "./languages";
|
||||
import { Logger } from "./logging";
|
||||
import { ConfigurationError } from "./util";
|
||||
|
|
@ -63,6 +65,14 @@ export function getCredentials(
|
|||
|
||||
const out: Credential[] = [];
|
||||
for (const e of parsed) {
|
||||
// Mask credentials to reduce chance of accidental leakage in logs.
|
||||
if (e.password !== undefined) {
|
||||
core.setSecret(e.password);
|
||||
}
|
||||
if (e.token !== undefined) {
|
||||
core.setSecret(e.token);
|
||||
}
|
||||
|
||||
if (e.url === undefined && e.host === undefined) {
|
||||
// The proxy needs one of these to work. If both are defined, the url has the precedence.
|
||||
throw new ConfigurationError(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue