Convert x64 to amd64 in executable names

unfunco · Jun 14, 2021 · c2c13a9 · c2c13a9
1 parent d78b392
commit c2c13a9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/__tests__/setup-tanka.test.ts b/__tests__/setup-tanka.test.ts
@@ -141,4 +141,18 @@ describe('GitHub Actions × Grafana Tanka', () => {
       undefined
     );
   });
+
+  it('installs windows/x64 versions', async () => {
+    os.platform = 'linux';
+    os.arch = 'x64';
+
+    downloadToolSpy.mockImplementation(() => '/');
+
+    await tanka.install('0.16.0');
+
+    expect(downloadToolSpy).toHaveBeenCalledWith(
+      'https://github.com/grafana/tanka/releases/download/v0.16.0/tk-linux-amd64',
+      undefined
+    );
+  });
 });
diff --git a/dist/index.js b/dist/index.js
@@ -144,11 +144,15 @@ function install(version) {
 }
 exports.install = install;
 function getExecutableName() {
+    let arch = os.arch();
     let platform = os.platform().toString();
     if (platform === 'win32') {
         platform = 'windows';
     }
-    return `tk-${platform}-${os.arch()}`;
+    if (arch === 'x64') {
+        arch = 'amd64';
+    }
+    return `tk-${platform}-${arch}`;
 }
 function formatVersion(version) {
     let parts = version.split('-');

diff --git a/src/tanka.ts b/src/tanka.ts
@@ -25,7 +25,9 @@ export async function install(version: string): Promise<void> {
   const executableName = getExecutableName();
 
   const tkDownloadUrl = `https://github.com/grafana/tanka/releases/download/${semanticVersion}/${executableName}`;
-  core.info(`Downloading Grafana Tanka ${semanticVersion} from ${tkDownloadUrl}`);
+  core.info(
+    `Downloading Grafana Tanka ${semanticVersion} from ${tkDownloadUrl}`
+  );
   const tkDownload = await tc.downloadTool(tkDownloadUrl, undefined);
 
   const tkDownloadPath = path.basename(tkDownload);
@@ -42,12 +44,17 @@ export async function install(version: string): Promise<void> {
 }
 
 function getExecutableName(): string {
+  let arch = os.arch();
   let platform = os.platform().toString();
   if (platform === 'win32') {
     platform = 'windows';
   }
 
-  return `tk-${platform}-${os.arch()}`;
+  if (arch === 'x64') {
+    arch = 'amd64';
+  }
+
+  return `tk-${platform}-${arch}`;
 }
 
 function formatVersion(version: string): string {