Skip to content

Commit 27cc8b2

Browse files
Merge pull request #32 from github/codeql-download-failure
provide a better error when codeql fails to download
2 parents cd95d34 + 584df47 commit 27cc8b2

File tree

2 files changed

+28
-16
lines changed

2 files changed

+28
-16
lines changed

Diff for: lib/setup-tools.js

+14-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: src/setup-tools.ts

+14-8
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,19 @@ export async function setupCodeQL(): Promise<CodeQLSetup> {
3232
const version = '1.0.0';
3333
const codeqlURL = core.getInput('tools', { required: true });
3434

35-
let codeqlFolder = toolcache.find('CodeQL', version);
36-
if (codeqlFolder) {
37-
core.debug(`CodeQL found in cache ${codeqlFolder}`);
38-
} else {
39-
const codeqlPath = await toolcache.downloadTool(codeqlURL);
40-
const codeqlExtracted = await toolcache.extractTar(codeqlPath);
41-
codeqlFolder = await toolcache.cacheDir(codeqlExtracted, 'CodeQL', version);
35+
try {
36+
let codeqlFolder = toolcache.find('CodeQL', version);
37+
if (codeqlFolder) {
38+
core.debug(`CodeQL found in cache ${codeqlFolder}`);
39+
} else {
40+
const codeqlPath = await toolcache.downloadTool(codeqlURL);
41+
const codeqlExtracted = await toolcache.extractTar(codeqlPath);
42+
codeqlFolder = await toolcache.cacheDir(codeqlExtracted, 'CodeQL', version);
43+
}
44+
return new CodeQLSetup(path.join(codeqlFolder, 'codeql'));
45+
46+
} catch (e) {
47+
core.error(e);
48+
throw new Error("Unable to download and extract CodeQL CLI");
4249
}
43-
return new CodeQLSetup(path.join(codeqlFolder, 'codeql'));
4450
}

0 commit comments

Comments
 (0)