From ad8eb1b3137f50e3a4dfe4dcb1b466a9ee10347e Mon Sep 17 00:00:00 2001 From: thegecko Date: Sat, 24 Feb 2024 11:21:51 +0000 Subject: [PATCH 1/4] Add prebuild for windows arm64 --- .github/workflows/build.yml | 14 ++++++++++---- package.json | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11220639..059450b1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,27 +16,33 @@ jobs: os: macos-11 node: x64 command: prebuildify - args: --arch x64+arm64 + args: --arch x64+arm64 --target 14.0.0 - name: win32-x86 os: windows-2019 node: x86 command: prebuildify + args: --target 14.0.0 - name: win32-x64 os: windows-2019 node: x64 command: prebuildify + args: --target 14.0.0 + - name: win32-arm64 + os: windows-2019 + command: prebuildify + args: --arch arm64 --target 20.11.1 - name: linux-x64 os: ubuntu-latest command: prebuildify-cross - args: -i centos7-devtoolset7 -i alpine + args: -i centos7-devtoolset7 -i alpine --target 14.0.0 - name: linux-arm os: ubuntu-latest command: prebuildify-cross - args: -i linux-arm64-lts -i linux-armv7 -i linux-armv6 + args: -i linux-arm64-lts -i linux-armv7 -i linux-armv6 --target 14.0.0 - name: android-arm os: ubuntu-latest command: prebuildify-cross - args: -i android-arm64 -i android-armv7 + args: -i android-arm64 -i android-armv7 --target 14.0.0 name: Build ${{ matrix.name }} runs-on: ${{ matrix.os }} steps: diff --git a/package.json b/package.json index 1dbbe181..7b194db5 100644 --- a/package.json +++ b/package.json @@ -57,8 +57,8 @@ "scripts": { "build": "rm -rf dist && tsc -p tsconfig-build.json", "install": "node-gyp-build", - "prebuildify": "prebuildify --napi --target 14.0.0 --force --strip --verbose", - "prebuildify-cross": "prebuildify-cross --napi --target 14.0.0 --force --strip --verbose", + "prebuildify": "prebuildify --napi --force --strip --verbose", + "prebuildify-cross": "prebuildify-cross --napi --force --strip --verbose", "rebuild": "node-gyp rebuild", "format": "eslint lib test bin --fix", "lint": "eslint lib test bin && cc --verbose", From 39798c88665ea824af99427ea157a2336ebe2666 Mon Sep 17 00:00:00 2001 From: thegecko Date: Sat, 24 Feb 2024 14:52:00 +0000 Subject: [PATCH 2/4] Install setuptools on macos workflows --- .github/workflows/build.yml | 2 ++ .github/workflows/test.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 059450b1..117eba12 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,6 +46,8 @@ jobs: name: Build ${{ matrix.name }} runs-on: ${{ matrix.os }} steps: + - if: matrix.os == 'macos-11' + run: sudo -H pip install setuptools - if: matrix.node uses: actions/setup-node@v3 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 951b859a..a1cc9372 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,6 +27,8 @@ jobs: - { os: ubuntu-latest, arch: x64 } - { os: windows-2019, arch: x64 } steps: + - if: matrix.config.os == 'macos-latest' + run: sudo -H pip install setuptools - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: From d08f227b2de808d66137fa17256ab0e0009219da Mon Sep 17 00:00:00 2001 From: Rob Moran Date: Mon, 1 Apr 2024 21:58:40 +0100 Subject: [PATCH 3/4] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 117eba12..4cd6c1fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: branches: - main - beta + - windows-arm concurrency: group: build-${{ github.ref }} cancel-in-progress: false From e0b7c1e945ea0005548d46c8115280218af46c96 Mon Sep 17 00:00:00 2001 From: robmor01 Date: Thu, 4 Jul 2024 11:36:52 +0100 Subject: [PATCH 4/4] Drop windows-arm branch --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4cd6c1fa..117eba12 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,6 @@ on: branches: - main - beta - - windows-arm concurrency: group: build-${{ github.ref }} cancel-in-progress: false