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

provide a better error when codeql fails to download
github · May 13, 2020 · 27cc8b2 · 27cc8b2
2 parents cd95d34 + 584df47
commit 27cc8b2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/lib/setup-tools.js b/lib/setup-tools.js
diff --git a/src/setup-tools.ts b/src/setup-tools.ts
@@ -32,13 +32,19 @@ export async function setupCodeQL(): Promise<CodeQLSetup> {
     const version = '1.0.0';
     const codeqlURL = core.getInput('tools', { required: true });
 
-    let codeqlFolder = toolcache.find('CodeQL', version);
-    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);
+    try {
+        let codeqlFolder = toolcache.find('CodeQL', version);
+        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'));
+
+    } catch (e) {
+        core.error(e);
+        throw new Error("Unable to download and extract CodeQL CLI");
     }
-    return new CodeQLSetup(path.join(codeqlFolder, 'codeql'));
 }