diff --git a/.github/workflows/build-vmtool.yaml b/.github/workflows/build-vmtool.yaml index 8c095d640..ddec432b5 100644 --- a/.github/workflows/build-vmtool.yaml +++ b/.github/workflows/build-vmtool.yaml @@ -21,7 +21,7 @@ jobs: path: arthas-vmtool/target/lib* mac: - runs-on: macos-10.15 + runs-on: macos-latest steps: - uses: actions/checkout@v2 diff --git a/arthas-vmtool/pom.xml b/arthas-vmtool/pom.xml index 653a58287..824bf12af 100644 --- a/arthas-vmtool/pom.xml +++ b/arthas-vmtool/pom.xml @@ -20,13 +20,12 @@ mac - x86_64 macos - -m64 - libArthasJniLibrary-x64.dylib + -arch x86_64 -arch arm64 + libArthasJniLibrary.dylib @@ -181,7 +180,7 @@ ${os_arch_option} -fpic -shared - -o + -o ${project.build.directory}/${lib_name} diff --git a/common/src/main/java/com/taobao/arthas/common/VmToolUtils.java b/common/src/main/java/com/taobao/arthas/common/VmToolUtils.java index 7967b415e..179de0836 100644 --- a/common/src/main/java/com/taobao/arthas/common/VmToolUtils.java +++ b/common/src/main/java/com/taobao/arthas/common/VmToolUtils.java @@ -9,7 +9,7 @@ public class VmToolUtils { private static String libName = null; static { if (OSUtils.isMac()) { - libName = "libArthasJniLibrary-x64.dylib"; + libName = "libArthasJniLibrary.dylib"; } if (OSUtils.isLinux()) { libName = "libArthasJniLibrary-x64.so"; diff --git a/lib/libArthasJniLibrary-x64.dylib b/lib/libArthasJniLibrary-x64.dylib deleted file mode 100644 index f1e977585..000000000 Binary files a/lib/libArthasJniLibrary-x64.dylib and /dev/null differ diff --git a/lib/libArthasJniLibrary.dylib b/lib/libArthasJniLibrary.dylib new file mode 100644 index 000000000..768ac9757 Binary files /dev/null and b/lib/libArthasJniLibrary.dylib differ