Merge branch 'main' into cbraynor/fix206

src/codeql.test.ts

@@ -144,10 +144,16 @@ test("download codeql bundle cache with different version cached (not pinned)",
     );
 
     t.assert(toolcache.find("CodeQL", "0.0.0-20200601"));
+    const platform =
+      process.platform === "win32"
+        ? "win64"
+        : process.platform === "linux"
+        ? "linux64"
+        : "osx64";
 
     nock("https://github.com")
       .get(
-        `/github/codeql-action/releases/download/${defaults.bundleVersion}/codeql-bundle.tar.gz`
+        `/github/codeql-action/releases/download/${defaults.bundleVersion}/codeql-bundle-${platform}.tar.gz`
       )
       .replyWithFile(
         200,
@@ -170,7 +176,7 @@ test("download codeql bundle cache with different version cached (not pinned)",
   });
 });
 
-test('download codeql bundle cache with pinned different version cached if "latests" tools specied', async (t) => {
+test('download codeql bundle cache with pinned different version cached if "latests" tools specified', async (t) => {
   await util.withTmpDir(async (tmpDir) => {
     nock("https://example.com")
       .get(`/download/codeql-bundle-20200601/codeql-bundle.tar.gz`)
@@ -191,9 +197,16 @@ test('download codeql bundle cache with pinned different version cached if "late
 
     t.assert(toolcache.find("CodeQL", "0.0.0-20200601"));
 
+    const platform =
+      process.platform === "win32"
+        ? "win64"
+        : process.platform === "linux"
+        ? "linux64"
+        : "osx64";
+
     nock("https://github.com")
       .get(
-        `/github/codeql-action/releases/download/${defaults.bundleVersion}/codeql-bundle.tar.gz`
+        `/github/codeql-action/releases/download/${defaults.bundleVersion}/codeql-bundle-${platform}.tar.gz`
       )
       .replyWithFile(
         200,

src/codeql.ts

@@ -116,9 +116,22 @@ export interface ResolveQueriesOutput {
 let cachedCodeQL: CodeQL | undefined = undefined;
 
 const CODEQL_BUNDLE_VERSION = defaults.bundleVersion;
-const CODEQL_BUNDLE_NAME = "codeql-bundle.tar.gz";
 const CODEQL_DEFAULT_ACTION_REPOSITORY = "github/codeql-action";
 
+function getCodeQLBundleName(): string {
+  let platform: string;
+  if (process.platform === "win32") {
+    platform = "win64";
+  } else if (process.platform === "linux") {
+    platform = "linux64";
+  } else if (process.platform === "darwin") {
+    platform = "osx64";
+  } else {
+    return "codeql-bundle.tar.gz";
+  }
+  return `codeql-bundle-${platform}.tar.gz`;
+}
+
 function getCodeQLActionRepository(mode: util.Mode): string {
   if (mode !== "actions") {
     return CODEQL_DEFAULT_ACTION_REPOSITORY;
@@ -162,6 +175,7 @@ async function getCodeQLBundleDownloadURL(
   const uniqueDownloadSources = potentialDownloadSources.filter(
     (url, index, self) => index === self.indexOf(url)
   );
+  const codeQLBundleName = getCodeQLBundleName();
   for (const downloadSource of uniqueDownloadSources) {
     const [apiURL, repository] = downloadSource;
     // If we've reached the final case, short-circuit the API check since we know the bundle exists and is public.
@@ -181,7 +195,7 @@ async function getCodeQLBundleDownloadURL(
           tag: CODEQL_BUNDLE_VERSION,
         });
       for (const asset of release.data.assets) {
-        if (asset.name === CODEQL_BUNDLE_NAME) {
+        if (asset.name === codeQLBundleName) {
           logger.info(
             `Found CodeQL bundle in ${downloadSource[1]} on ${downloadSource[0]} with URL ${asset.url}.`
           );
@@ -194,7 +208,7 @@ async function getCodeQLBundleDownloadURL(
       );
     }
   }
-  return `https://github.com/${CODEQL_DEFAULT_ACTION_REPOSITORY}/releases/download/${CODEQL_BUNDLE_VERSION}/${CODEQL_BUNDLE_NAME}`;
+  return `https://github.com/${CODEQL_DEFAULT_ACTION_REPOSITORY}/releases/download/${CODEQL_BUNDLE_VERSION}/${codeQLBundleName}`;
 }
 
 // We have to download CodeQL manually because the toolcache doesn't support Accept headers.