Skip to content

Commit 0316210

Browse files
committed
Start-proxy: Fetch OS specific binary
1 parent cba5fb5 commit 0316210

File tree

2 files changed

+25
-13
lines changed

2 files changed

+25
-13
lines changed

lib/start-proxy-action.js

Lines changed: 12 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/start-proxy-action.ts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ import { getActionsLogger, Logger } from "./logging";
1010
import * as util from "./util";
1111

1212
const UPDATEJOB_PROXY = "update-job-proxy";
13-
const UPDATEJOB_PROXY_VERSION = "v2.0.20240722180912";
14-
const UPDATEJOB_PROXY_URL =
15-
"https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.18.1/update-job-proxy.tar.gz";
13+
const UPDATEJOB_PROXY_VERSION = "v2.0.20241023203727";
14+
const UPDATEJOB_PROXY_URL_PREFIX = "https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.18.1/";
1615
const PROXY_USER = "proxy_user";
1716
const KEY_SIZE = 2048;
1817
const KEY_EXPIRY_YEARS = 2;
@@ -229,17 +228,24 @@ function getProxyAuth(): BasicAuthCredentials | undefined {
229228
}
230229

231230
async function getProxyBinaryPath(): Promise<string> {
232-
let proxyBin = toolcache.find(UPDATEJOB_PROXY, UPDATEJOB_PROXY_VERSION);
231+
const proxyFileName = process.platform === "win32" ? `${UPDATEJOB_PROXY}.exe` : UPDATEJOB_PROXY;
232+
const platform = process.platform === "win32" ? "win64" :
233+
process.platform === "darwin" ? "macos64" :
234+
"linux64";
235+
const proxyPackage = `${UPDATEJOB_PROXY}-${platform}.tar.gz`;
236+
const proxyURL = `${UPDATEJOB_PROXY_URL_PREFIX}${proxyPackage}`;
237+
238+
let proxyBin = toolcache.find(proxyFileName, UPDATEJOB_PROXY_VERSION);
233239
if (!proxyBin) {
234-
const temp = await toolcache.downloadTool(UPDATEJOB_PROXY_URL);
240+
const temp = await toolcache.downloadTool(proxyURL);
235241
const extracted = await toolcache.extractTar(temp);
236242
proxyBin = await toolcache.cacheDir(
237243
extracted,
238-
UPDATEJOB_PROXY,
244+
proxyFileName,
239245
UPDATEJOB_PROXY_VERSION,
240246
);
241247
}
242-
proxyBin = path.join(proxyBin, UPDATEJOB_PROXY);
248+
proxyBin = path.join(proxyBin, proxyFileName);
243249
return proxyBin;
244250
}
245251

0 commit comments

Comments
 (0)