Merge branch 'main' into marcogario/skip_proxy
This commit is contained in:
commit
76622e7fee
9 changed files with 10 additions and 37 deletions
|
|
@ -14,7 +14,6 @@ const UPDATEJOB_PROXY = "update-job-proxy";
|
|||
const UPDATEJOB_PROXY_VERSION = "v2.0.20241023203727";
|
||||
const UPDATEJOB_PROXY_URL_PREFIX =
|
||||
"https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.18.1/";
|
||||
const PROXY_USER = "proxy_user";
|
||||
const KEY_SIZE = 2048;
|
||||
const KEY_EXPIRY_YEARS = 2;
|
||||
|
||||
|
|
@ -113,12 +112,10 @@ async function runWrapper() {
|
|||
);
|
||||
|
||||
const ca = generateCertificateAuthority();
|
||||
const proxyAuth = getProxyAuth();
|
||||
|
||||
const proxyConfig: ProxyConfig = {
|
||||
all_credentials: credentials,
|
||||
ca,
|
||||
proxy_auth: proxyAuth,
|
||||
};
|
||||
|
||||
// Start the Proxy
|
||||
|
|
@ -187,18 +184,6 @@ async function startProxy(
|
|||
}
|
||||
}
|
||||
|
||||
// getProxyAuth returns the authentication information for the proxy itself.
|
||||
function getProxyAuth(): BasicAuthCredentials | undefined {
|
||||
const proxy_password = actionsUtil.getOptionalInput("proxy_password");
|
||||
if (proxy_password) {
|
||||
return {
|
||||
username: PROXY_USER,
|
||||
password: proxy_password,
|
||||
};
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
async function getProxyBinaryPath(): Promise<string> {
|
||||
const proxyFileName =
|
||||
process.platform === "win32" ? `${UPDATEJOB_PROXY}.exe` : UPDATEJOB_PROXY;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue