Merge pull request #12 from kachick/fix-darwin-x86_64

Fix installation for x86_64 darwin
luizm · Aug 19, 2024 · fbb84e8 · fbb84e8
2 parents ff25d43 + a2a1c48
commit fbb84e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,8 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-latest
+          - macos-14 # aarch64
+          - macos-13 # x86_64
     runs-on: ${{ matrix.os }}
     steps:
       - uses: asdf-vm/actions/plugin-test@v2

diff --git a/bin/install b/bin/install
@@ -16,7 +16,7 @@ _get_arch() {
   local arch; arch=$(uname -m)
   case $arch in
     armv*) arch="armv6hf";;
-    aarch64) arch="aarch64";;
+    aarch64 | arm64) arch="aarch64";;
     x86_64) arch="x86_64";;
   esac
   echo "$arch"
@@ -48,8 +48,6 @@ install() {
 	local -r version_parts=(${version//./ })
 	if [ "${version_parts[0]}" -eq 0 ] && [ "${version_parts[1]}" -lt 10 ]; then
 		test "$platform" == "darwin" && arch="x86_64"
-	else
-		test "$platform" == "darwin" && arch="aarch64"
 	fi
 
 	local -r download_url="$(_get_download_url "${version}" "${platform}" "${arch}")"