Adds support for mac M1. Closes #529 (#534)

microsoft · Jan 29, 2024 · a6d0662 · a6d0662
1 parent e5471ec
commit a6d0662
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -14,6 +14,7 @@ jobs:
           - win-x86
           - linux-x64
           - osx-x64
+          - osx-arm64
     env:
       release: 'dev-proxy-${{ matrix.architecture }}-${{ github.ref_name }}'
     steps:

diff --git a/scripts/setup-beta.ps1 b/scripts/setup-beta.ps1
@@ -62,6 +62,8 @@ if ($os -match "Windows") {
 } elseif ($os -match "Darwin") {
     if ($arch -eq "X64") {
         $url = "$base_url-osx-x64-$version.zip"
+    } elseif ($arch -eq "Arm64") {
+        $url = "$base_url-osx-arm64-$version.zip"
     } else {
         Write-Host "Unsupported architecture $arch. Aborting"
         exit 1

diff --git a/scripts/setup-beta.sh b/scripts/setup-beta.sh
@@ -49,7 +49,7 @@ base_url="https://github.com/microsoft/dev-proxy/releases/download/$version/dev-
 if [ "$(uname)" == "Darwin" ]; then
     ARCH="$(uname -m)"
     if [ ${ARCH} == "arm64" ]; then
-        echo "unsupported architecture ${ARCH}. Aborting"; exit 1;
+        curl -sL -o ./devproxy.zip "$base_url-osx-arm64-$version.zip" || { echo "Cannot install Dev Proxy. Aborting"; exit 1; }
     elif [ ${ARCH} == "x86_64" ]; then
         curl -sL -o ./devproxy.zip "$base_url-osx-x64-$version.zip" || { echo "Cannot install Dev Proxy. Aborting"; exit 1; }
     else

diff --git a/scripts/setup.ps1 b/scripts/setup.ps1
@@ -61,6 +61,8 @@ if ($os -match "Windows") {
 } elseif ($os -match "Darwin") {
     if ($arch -eq "X64") {
         $url = "$base_url-osx-x64-$version.zip"
+    } elseif ($arch -eq "Arm64") {
+        $url = "$base_url-osx-arm64-$version.zip"
     } else {
         Write-Host "Unsupported architecture $arch. Aborting"
         exit 1

diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -48,7 +48,7 @@ base_url="https://github.com/microsoft/dev-proxy/releases/download/$version/dev-
 if [ "$(uname)" == "Darwin" ]; then
     ARCH="$(uname -m)"
     if [ ${ARCH} == "arm64" ]; then
-        echo "unsupported architecture ${ARCH}. Aborting"; exit 1;
+        curl -sL -o ./devproxy.zip "$base_url-osx-arm64-$version.zip" || { echo "Cannot install Dev Proxy. Aborting"; exit 1; }
     elif [ ${ARCH} == "x86_64" ]; then
         curl -sL -o ./devproxy.zip "$base_url-osx-x64-$version.zip" || { echo "Cannot install Dev Proxy. Aborting"; exit 1; }
     else
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ jobs: @@
               - win-x86
               - linux-x64
               - osx-x64
+              - osx-arm64
         env:
           release: 'dev-proxy-${{ matrix.architecture }}-${{ github.ref_name }}'
         steps:
@@ Expand Down @@