From c66e20e741518e3eafcbf5cbe2af1caa6d60c81b Mon Sep 17 00:00:00 2001
From: Pavel Minaev <pminaev@microsoft.com>
Date: Wed, 23 Aug 2023 13:16:15 -0700
Subject: [PATCH] Use uname -m.

---
 .github/workflows/attach_to_process.yml                     | 3 +--
 .../pydevd_attach_to_process/linux_and_mac/compile_linux.sh | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/attach_to_process.yml b/.github/workflows/attach_to_process.yml
index 269161558..46489ac3e 100644
--- a/.github/workflows/attach_to_process.yml
+++ b/.github/workflows/attach_to_process.yml
@@ -16,11 +16,10 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Clean up old binaries
-        shell: powershell
         run: rm ${{ env.PYDEVD_ATTACH_TO_PROCESS }}\* -include *.exe,*.dll,*.pdb
 
       - name: Compile binaries
-        run: .\compile_windows.bat
+        run: ${{ env.PYDEVD_ATTACH_TO_PROCESS }}\compile_windows.bat
 
       - name: Upload binaries
         uses: actions/upload-artifact@v3
diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/linux_and_mac/compile_linux.sh b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/linux_and_mac/compile_linux.sh
index 452e74399..6df8c1fbe 100644
--- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/linux_and_mac/compile_linux.sh
+++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/linux_and_mac/compile_linux.sh
@@ -1,9 +1,9 @@
 set -e
 
-ARCH="$(uname -i)"
+ARCH="$(uname -m)"
 case $ARCH in
-    i686) SUFFIX=x86;;
-    x86_64) SUFFIX=amd64;;
+    i*86) SUFFIX=x86;;
+    x86_64*) SUFFIX=amd64;;
     *) echo >&2 "unsupported: $ARCH"; exit 1;;
 esac