Merge pull request #30 from hross/master

Change getFileName to do architecture lookups and add arm support
actions · Nov 25, 2019 · 9fbc767 · 9fbc767
2 parents 75259a5 + 0cbaec8
commit 9fbc767
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/installer.js b/lib/installer.js
@@ -72,6 +72,7 @@ function acquireGo(version) {
         //
         let fileName = getFileName(version);
         let downloadUrl = getDownloadUrl(fileName);
+        core.debug('Downloading Go from: ' + downloadUrl);
         let downloadPath = null;
         try {
             downloadPath = yield tc.downloadTool(downloadUrl);
@@ -102,8 +103,14 @@ function acquireGo(version) {
     });
 }
 function getFileName(version) {
+    const arches = {
+        x64: 'amd64',
+        arm: 'armv6l',
+        arm64: 'arm64',
+        default: '386'
+    };
     const platform = osPlat == 'win32' ? 'windows' : osPlat;
-    const arch = osArch == 'x64' ? 'amd64' : '386';
+    const arch = arches[osArch] || arches['default'];
     const ext = osPlat == 'win32' ? 'zip' : 'tar.gz';
     const filename = util.format('go%s.%s-%s.%s', version, platform, arch, ext);
     return filename;

diff --git a/src/installer.ts b/src/installer.ts
@@ -57,6 +57,9 @@ async function acquireGo(version: string): Promise<string> {
   //
   let fileName: string = getFileName(version);
   let downloadUrl: string = getDownloadUrl(fileName);
+
+  core.debug('Downloading Go from: ' + downloadUrl);
+
   let downloadPath: string | null = null;
   try {
     downloadPath = await tc.downloadTool(downloadUrl);
@@ -89,8 +92,15 @@ async function acquireGo(version: string): Promise<string> {
 }
 
 function getFileName(version: string): string {
+  const arches: {[arch: string]: string} = {
+    x64: 'amd64',
+    arm: 'armv6l',
+    arm64: 'arm64',
+    default: '386'
+  };
+
   const platform: string = osPlat == 'win32' ? 'windows' : osPlat;
-  const arch: string = osArch == 'x64' ? 'amd64' : '386';
+  const arch: string = arches[osArch] || arches['default'];
   const ext: string = osPlat == 'win32' ? 'zip' : 'tar.gz';
   const filename: string = util.format(
     'go%s.%s-%s.%s',
@@ -99,6 +109,7 @@ function getFileName(version: string): string {
     arch,
     ext
   );
+
   return filename;
 }