Rename proxyBin to proxyDir

This commit is contained in:
Michael B. Gale
2026-10-14 13:58:37 +01:00
parent 71ad3a794a
commit 962aaad938
2 changed files with 10 additions and 10 deletions

10
lib/entry-points.js generated
View File

@@ -187859,8 +187859,8 @@ async function getProxyBinaryPath(action, apiDetails) {
logger2.info(
`Using authentication proxy from CodeQL release ${proxyInfo.version}.`
);
let proxyBin = toolcache4.find(proxyFileName, proxyInfo.version);
if (!proxyBin) {
let proxyDir = toolcache4.find(proxyFileName, proxyInfo.version);
if (!proxyDir) {
logger2.info(
`Authentication proxy is not in the toolcache. Will try to download it from '${proxyInfo.url}'.`
);
@@ -187872,15 +187872,15 @@ async function getProxyBinaryPath(action, apiDetails) {
const temp = await downloadProxy(logger2, proxyInfo.url, authorization);
logger2.info(`Downloaded the authentication proxy asset to '${temp}'.`);
const extracted = await extractProxy(logger2, temp);
proxyBin = await cacheProxy(
proxyDir = await cacheProxy(
logger2,
extracted,
proxyFileName,
proxyInfo.version
);
logger2.info(`Extracted the authentication proxy to '${proxyBin}'.`);
logger2.info(`Extracted the authentication proxy to '${proxyDir}'.`);
}
return path27.join(proxyBin, proxyFileName);
return path27.join(proxyDir, proxyFileName);
} finally {
logger2.endGroup();
}

View File

@@ -552,9 +552,9 @@ export async function getProxyBinaryPath(
`Using authentication proxy from CodeQL release ${proxyInfo.version}.`,
);
let proxyBin = toolcache.find(proxyFileName, proxyInfo.version);
let proxyDir = toolcache.find(proxyFileName, proxyInfo.version);
if (!proxyBin) {
if (!proxyDir) {
logger.info(
`Authentication proxy is not in the toolcache. Will try to download it from '${proxyInfo.url}'.`,
);
@@ -569,16 +569,16 @@ export async function getProxyBinaryPath(
logger.info(`Downloaded the authentication proxy asset to '${temp}'.`);
const extracted = await extractProxy(logger, temp);
proxyBin = await cacheProxy(
proxyDir = await cacheProxy(
logger,
extracted,
proxyFileName,
proxyInfo.version,
);
logger.info(`Extracted the authentication proxy to '${proxyBin}'.`);
logger.info(`Extracted the authentication proxy to '${proxyDir}'.`);
}
return path.join(proxyBin, proxyFileName);
return path.join(proxyDir, proxyFileName);
} finally {
logger.endGroup();
}