From 01c3a85f8418309e3115e9fba3304c4fa49b0d9f Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 7 Mar 2025 00:11:54 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E9=87=8D=E6=96=B0=E5=8A=A0=E5=9B=9E?= =?UTF-8?q?=20arm64=20win=20=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/publish_nodejs/action.yml | 12 ++++++------ .github/workflows/build.yml | 2 +- .../NodeJS/release/maa-node/scripts/build.mjs | 2 +- .../NodeJS/release/maa-node/src/maa-client.js | 3 +++ .../NodeJS/release/maa-node/src/maa-server.js | 3 +++ source/binding/NodeJS/scripts/pack.ts | 2 +- tools/nupkgs/Maa.Framework.Runtime.win-arm64.nuspec | 6 ++++++ tools/pip_pack/pip_pack.py | 2 +- 8 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 tools/nupkgs/Maa.Framework.Runtime.win-arm64.nuspec diff --git a/.github/actions/publish_nodejs/action.yml b/.github/actions/publish_nodejs/action.yml index 4b70b8ffa..a423487f3 100644 --- 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 index 574bd418b..abc222ded 100644 --- 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 index b4a0f9861..a61228ea5 100644 --- 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 index 5a9c773b8..242ef43d9 100644 --- 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 index 176b20f14..03dd1fe90 100644 --- 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 index 6f0bc6a7f..30790151a 100644 --- 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 new file mode 100644 index 000000000..e7b016062 --- /dev/null +++ b/tools/nupkgs/Maa.Framework.Runtime.win-arm64.nuspec @@ -0,0 +1,6 @@ + Maa.Framework.Runtime.win-arm64 + MAA Framework Runtime for win-arm64 + Native binaries of MAA Framework Embedded for win-arm64. + + + \ No newline at end of file diff --git a/tools/pip_pack/pip_pack.py b/tools/pip_pack/pip_pack.py index c4d62ec38..136cc2d4f 100644 --- 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",