Use uname -m.

int19h · Aug 23, 2023 · c66e20e · c66e20e
1 parent da4669e
commit c66e20e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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