chore: 重新加回 arm64 win 编译

MaaXYZ · Mar 6, 2025 · 01c3a85 · 01c3a85
1 parent fb94f8a
commit 01c3a85
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/.github/actions/publish_nodejs/action.yml b/.github/actions/publish_nodejs/action.yml
@@ -39,12 +39,12 @@ runs:
               token: ${{ inputs.token }}
               access: ${{ inputs.access }}
               dry-run: ${{ inputs.dry-run }}
-        # - uses: JS-DevTools/npm-publish@v3
-        #   with:
-        #       package: assets/MAA-nodejs-package/maa-node-win32-arm64
-        #       token: ${{ inputs.token }}
-        #       access: ${{ inputs.access }}
-        #       dry-run: ${{ inputs.dry-run }}
+        - uses: JS-DevTools/npm-publish@v3
+          with:
+              package: assets/MAA-nodejs-package/maa-node-win32-arm64
+              token: ${{ inputs.token }}
+              access: ${{ inputs.access }}
+              dry-run: ${{ inputs.dry-run }}
         - uses: JS-DevTools/npm-publish@v3
           with:
               package: assets/MAA-nodejs-package/maa-node-linux-x64

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
         runs-on: windows-latest
         strategy:
             matrix:
-                arch: [x86_64]
+                arch: [aarch64, x86_64]
             fail-fast: false
 
         steps:

diff --git a/source/binding/NodeJS/release/maa-node/scripts/build.mjs b/source/binding/NodeJS/release/maa-node/scripts/build.mjs
@@ -7,7 +7,7 @@ build({
     platform: 'node',
     external: [
         '@maaxyz/maa-node-win32-x64',
-        // '@maaxyz/maa-node-win32-arm64',
+        '@maaxyz/maa-node-win32-arm64',
         '@maaxyz/maa-node-linux-x64',
         '@maaxyz/maa-node-linux-arm64',
         '@maaxyz/maa-node-darwin-x64',

diff --git a/source/binding/NodeJS/release/maa-node/src/maa-client.js b/source/binding/NodeJS/release/maa-node/src/maa-client.js
@@ -3,6 +3,9 @@ if (!globalThis.MaaAPI) {
         case 'win32-x64':
             globalThis.MaaAPI = require('@maaxyz/maa-node-win32-x64')
             break
+        case 'win32-arm64':
+            globalThis.MaaAPI = require('@maaxyz/maa-node-win32-arm64')
+            break
         case 'linux-x64':
             globalThis.MaaAPI = require('@maaxyz/maa-node-linux-x64')
             break

diff --git a/source/binding/NodeJS/release/maa-node/src/maa-server.js b/source/binding/NodeJS/release/maa-node/src/maa-server.js
@@ -3,6 +3,9 @@ if (!globalThis.MaaAPI) {
         case 'win32-x64':
             globalThis.MaaAPI = require('@maaxyz/maa-node-win32-x64/server')
             break
+        case 'win32-arm64':
+            globalThis.MaaAPI = require('@maaxyz/maa-node-win32-arm64/server')
+            break
         case 'linux-x64':
             globalThis.MaaAPI = require('@maaxyz/maa-node-linux-x64/server')
             break

diff --git a/source/binding/NodeJS/scripts/pack.ts b/source/binding/NodeJS/scripts/pack.ts
@@ -13,7 +13,7 @@ const platforms: [maa: string, node: string][] = [
     ['win-x86_64', 'win32-x64'],
     ['linux-x86_64', 'linux-x64'],
     ['macos-x86_64', 'darwin-x64'],
-    // ['win-aarch64', 'win32-arm64'],
+    ['win-aarch64', 'win32-arm64'],
     ['linux-aarch64', 'linux-arm64'],
     ['macos-aarch64', 'darwin-arm64'],
 ]

diff --git a/tools/nupkgs/Maa.Framework.Runtime.win-arm64.nuspec b/tools/nupkgs/Maa.Framework.Runtime.win-arm64.nuspec
@@ -0,0 +1,6 @@
+    <id>Maa.Framework.Runtime.win-arm64</id>
+    <title>MAA Framework Runtime for win-arm64</title>
+    <description>Native binaries of MAA Framework Embedded for win-arm64.</description>
+  </metadata>
+  <files>
+    <file src="$root_path$\assets\MAA-win-aarch64\bin\**\*.dll*" target="runtimes\win-arm64\native" />
diff --git a/tools/pip_pack/pip_pack.py b/tools/pip_pack/pip_pack.py
@@ -104,7 +104,7 @@ def unpack_base_whl() -> str:
 def pack(pack_dir: str, info_path: str):
     WHL_TAGS = {
         "win-x86_64": "win_amd64",
-        # "win-aarch64": "win_arm64",
+        "win-aarch64": "win_arm64",
         "macos-x86_64": "macosx_13_0_x86_64",
         "macos-aarch64": "macosx_13_0_arm64",
         "linux-x86_64": "manylinux2014_x86_64",