robojerk/codeql-action

Merge pull request #32 from github/codeql-download-failure

Browse source 
provide a better error when codeql fails to download
This commit is contained in:
Robert 2020-05-13 09:01:56 +01:00 • committed by GitHub
commit 27cc8b23fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/setup-tools.js generated
View file

@ -37,15 +37,21 @@ exports.CodeQLSetup = CodeQLSetup;
async function setupCodeQL() { async function setupCodeQL() {
const version = '1.0.0'; const version = '1.0.0';
const codeqlURL = core.getInput('tools', { required: true }); const codeqlURL = core.getInput('tools', { required: true });
let codeqlFolder = toolcache.find('CodeQL', version); try {
if (codeqlFolder) { let codeqlFolder = toolcache.find('CodeQL', version);
core.debug(`CodeQL found in cache ${codeqlFolder}`); if (codeqlFolder) {
core.debug(`CodeQL found in cache ${codeqlFolder}`);
}
else {
const codeqlPath = await toolcache.downloadTool(codeqlURL);
const codeqlExtracted = await toolcache.extractTar(codeqlPath);
codeqlFolder = await toolcache.cacheDir(codeqlExtracted, 'CodeQL', version);
}
return new CodeQLSetup(path.join(codeqlFolder, 'codeql'));
} }
else { catch (e) {
const codeqlPath = await toolcache.downloadTool(codeqlURL); core.error(e);
const codeqlExtracted = await toolcache.extractTar(codeqlPath); throw new Error("Unable to download and extract CodeQL CLI");
codeqlFolder = await toolcache.cacheDir(codeqlExtracted, 'CodeQL', version);
} }
return new CodeQLSetup(path.join(codeqlFolder, 'codeql'));
} }
exports.setupCodeQL = setupCodeQL; exports.setupCodeQL = setupCodeQL;

22
src/setup-tools.ts
View file

@ -32,13 +32,19 @@ export async function setupCodeQL(): Promise<CodeQLSetup> {
const version = '1.0.0'; const version = '1.0.0';
const codeqlURL = core.getInput('tools', { required: true }); const codeqlURL = core.getInput('tools', { required: true });
let codeqlFolder = toolcache.find('CodeQL', version); try {
if (codeqlFolder) { let codeqlFolder = toolcache.find('CodeQL', version);
core.debug(`CodeQL found in cache ${codeqlFolder}`); if (codeqlFolder) {
} else { core.debug(`CodeQL found in cache ${codeqlFolder}`);
const codeqlPath = await toolcache.downloadTool(codeqlURL); } else {
const codeqlExtracted = await toolcache.extractTar(codeqlPath); const codeqlPath = await toolcache.downloadTool(codeqlURL);
codeqlFolder = await toolcache.cacheDir(codeqlExtracted, 'CodeQL', version); const codeqlExtracted = await toolcache.extractTar(codeqlPath);
codeqlFolder = await toolcache.cacheDir(codeqlExtracted, 'CodeQL', version);
}
return new CodeQLSetup(path.join(codeqlFolder, 'codeql'));
} catch (e) {
core.error(e);
throw new Error("Unable to download and extract CodeQL CLI");
} }
return new CodeQLSetup(path.join(codeqlFolder, 'codeql'));
} }