fix: use "uname -m" when retrieving os arch in Native.java. Change wi…

…n32 to windows.
LimeChain · Jun 9, 2024 · c8a3b3c · c8a3b3c
1 parent 01fb7d7
commit c8a3b3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/build_publish.yaml b/.github/workflows/build_publish.yaml
@@ -33,7 +33,7 @@ jobs:
 
           - os: 'windows-latest'
             target: 'x86_64-pc-windows-msvc'
-            artifact: 'win32-amd64'
+            artifact: 'windows-amd64'
             lib_name: 'wasmer_jni.dll'
     uses: ./.github/workflows/dynamic_libs_reusable.yaml
     with:

diff --git a/src/java/org/wasmer/Native.java b/src/java/org/wasmer/Native.java
@@ -28,13 +28,11 @@ public static String getCurrentPlatformIdentifier() {
             osName = "windows";
         } else if (osName.contains("mac os x")) {
             osName = "darwin";
-            String[] args = new String[] {"/bin/bash", "-c", "uname", "-p"};
+            String[] args = new String[] {"/bin/bash", "-c", "uname -m"};
             try {
                 Process proc = new ProcessBuilder(args).start();
                 BufferedReader reader = new BufferedReader(new InputStreamReader(proc.getInputStream()));
-                if (reader.readLine().equals("Darwin")) {
-                    return osName + "-arm64";
-                }
+                return osName + "-" + reader.readLine();
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }