add mac arm support

Author: hadarshjfrog

action/lib/utils.js

@@ -182,6 +182,9 @@ class Utils {
             return 'windows-amd64';
         }
         if ((0, os_1.platform)().includes('darwin')) {
+            if ((0, os_1.arch)().includes('arm')) {
+                return (0, os_1.arch)().includes('64') ? 'mac-arm64' : 'mac-arm';
+            }
             return 'mac-386';
         }
         if ((0, os_1.arch)().includes('arm')) {

action/src/utils.ts

@@ -152,6 +152,9 @@ export class Utils {
             return 'windows-amd64';
         }
         if (platform().includes('darwin')) {
+            if (arch().includes('arm')) {
+                return arch().includes('64') ? 'mac-arm64' : 'mac-arm';
+            }
             return 'mac-386';
         }
         if (arch().includes('arm')) {

buildscripts/getFrogbot.sh

@@ -31,7 +31,19 @@ setWindowsProperties() {
 
 setMacProperties() {
   FROGBOT_OS="mac"
-  URL="${PLATFORM_URL}/artifactory/${REMOTE_PATH}frogbot/v2/${VERSION}/frogbot-mac-386/frogbot"
+  MACHINE_TYPE="$(uname -m)"
+  case $MACHINE_TYPE in
+      arm | armv7l)
+          ARCH="arm"
+          ;;
+      aarch64)
+          ARCH="arm64"
+          ;;
+      *)
+          ARCH="386"
+          ;;
+  esac
+  URL="${PLATFORM_URL}/artifactory/${REMOTE_PATH}frogbot/v2/${VERSION}/frogbot-${FROGBOT_OS}-${ARCH}/frogbot"
   FILE_NAME="frogbot"
 }
 

release/buildAndUpload.sh

@@ -67,6 +67,8 @@ buildAndUpload 'frogbot-linux-arm' 'linux' 'arm' ''
 buildAndUpload 'frogbot-linux-ppc64' 'linux' 'ppc64' ''
 buildAndUpload 'frogbot-linux-ppc64le' 'linux' 'ppc64le' ''
 buildAndUpload 'frogbot-mac-386' 'darwin' 'amd64' ''
+buildAndUpload 'frogbot-mac-arm64' 'darwin' 'arm64' ''
+buildAndUpload 'frogbot-mac-arm' 'darwin' 'arm' ''
 buildAndUpload 'frogbot-windows-amd64' 'windows' 'amd64' '.exe'
 
 jf rt u "./buildscripts/getFrogbot.sh" "$pkgPath/$version/" --flat