Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds support for mac M1. Closes #529 #534

Merged
merged 1 commit into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/create-release.yml
Original file line number Diff 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
2 changes: 2 additions & 0 deletions scripts/setup-beta.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-beta.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions scripts/setup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading