From 2770acc84a143721f5ad6782a0bca46269e9a96a Mon Sep 17 00:00:00 2001 From: Stephen Carlin Date: Wed, 30 Apr 2025 20:57:53 -0400 Subject: [PATCH 1/7] Add Electron 33 support with fixes for compatibility issues --- .github/workflows/prebuild-main.yml | 5 +++++ .github/workflows/prebuild-pr.yml | 5 +++++ README.md | 2 +- binding.gyp | 5 ++++- package-lock.json | 2 +- package.json | 5 +++-- patches/electron-v8-macros.patch | 26 ++++++++++++++++++++++++++ src/node_printer_win.cc | 26 +++++++++++++------------- 8 files changed, 58 insertions(+), 18 deletions(-) create mode 100644 patches/electron-v8-macros.patch diff --git a/.github/workflows/prebuild-main.yml b/.github/workflows/prebuild-main.yml index 9914ba80..dd69b982 100644 --- a/.github/workflows/prebuild-main.yml +++ b/.github/workflows/prebuild-main.yml @@ -26,6 +26,8 @@ jobs: npm run apply-patches npm run prebuild -- --strip --all --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} npm run prebuild -- --strip --all --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} + npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} + npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} prebuild-macos: name: Prebuild Binaries for macOS runs-on: macos-latest @@ -40,6 +42,7 @@ jobs: run: | npm run apply-patches npm run prebuild -- --strip --all --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} + npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} prebuild-windows: name: Prebuild Binaries for Windows runs-on: windows-latest @@ -55,3 +58,5 @@ jobs: npm run apply-patches npm run prebuild -- --strip --all --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} npm run prebuild -- --strip --all --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} + npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} + npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} diff --git a/.github/workflows/prebuild-pr.yml b/.github/workflows/prebuild-pr.yml index a4ab8bda..09b9982c 100644 --- a/.github/workflows/prebuild-pr.yml +++ b/.github/workflows/prebuild-pr.yml @@ -24,6 +24,8 @@ jobs: npm run apply-patches npm run prebuild -- --strip --all --arch ia32 npm run prebuild -- --strip --all --arch x64 + npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch ia32 + npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 prebuild-macos: name: Prebuild Binaries for macOS runs-on: macos-latest @@ -38,6 +40,7 @@ jobs: run: | npm run apply-patches npm run prebuild -- --strip --all --arch x64 + npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 prebuild-windows: name: Prebuild Binaries for Windows runs-on: windows-latest @@ -53,3 +56,5 @@ jobs: npm run apply-patches npm run prebuild -- --strip --all --arch ia32 npm run prebuild -- --strip --all --arch x64 + npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch ia32 + npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 diff --git a/README.md b/README.md index a53d6bc5..b904908c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Native bind printers on POSIX and Windows OS from Node.js, electron and node-web [![npm version](https://badge.fury.io/js/@thiagoelg%2Fnode-printer.svg)](https://www.npmjs.com/package/@thiagoelg/node-printer) [![Prebuild Binaries and Publish](https://github.com/thiagoelg/node-printer/actions/workflows/prebuild-main.yml/badge.svg)](https://github.com/thiagoelg/node-printer/actions/workflows/prebuild-main.yml) -> Now compatible with Node.js 20+ with improved native bindings and updated dependencies +> Now compatible with Node.js 20+ and Electron 33+ with improved native bindings and updated dependencies > It just works with Node 12 because of @thiagoelg in his [PR](https://github.com/tojocky/node-printer/pull/261) diff --git a/binding.gyp b/binding.gyp index a7f9a401..f3bf28f8 100644 --- a/binding.gyp +++ b/binding.gyp @@ -35,7 +35,10 @@ ['OS!="win"', { 'sources/': [['exclude', '_win\\.cc$']]}, { # else if OS==win, exclude also posix files - 'sources/': [['exclude', '_posix\\.cc$']] + 'sources/': [['exclude', '_posix\\.cc$']], + 'defines': [ + 'NOMINMAX' + ] }], # specific settings ['OS!="win"', { diff --git a/package-lock.json b/package-lock.json index e1985ab4..9810c8de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "prebuild-install": "^7.1.1" }, "devDependencies": { - "node-abi": "^3.52.0", + "node-abi": "^3.56.0", "nodeunit": "^0.11.3", "patch-package": "^8.0.0", "prebuild": "^13.0.1", diff --git a/package.json b/package.json index 77f573f2..2113e378 100644 --- a/package.json +++ b/package.json @@ -22,17 +22,18 @@ "nodeunit": "^0.11.3", "prebuild": "^13.0.1", "prebuild-ci": "^4.0.0", - "node-abi": "^3.52.0", + "node-abi": "^3.56.0", "patch-package": "^8.0.0" }, "engines": { "node": ">= 20.0.0" }, "scripts": { - "install": "prebuild-install || node-gyp rebuild", + "install": "npm run apply-patches && prebuild-install || node-gyp rebuild", "apply-patches": "patch-package", "prebuild-all": "prebuild --all --force --strip --verbose --openssl_fips=X", "prebuild": "prebuild", + "prebuild-electron": "prebuild --runtime electron --target 33.0.0 --strip --verbose", "rebuild": "node-gyp rebuild", "test": "nodeunit test" }, diff --git a/patches/electron-v8-macros.patch b/patches/electron-v8-macros.patch new file mode 100644 index 00000000..8aa02b5c --- /dev/null +++ b/patches/electron-v8-macros.patch @@ -0,0 +1,26 @@ +diff --git a/binding.gyp b/binding.gyp +index 2276..2376 100644 +--- a/binding.gyp ++++ b/binding.gyp +@@ -25,7 +25,8 @@ + 'include_dirs' : [ + "_value = (Type*)malloc(iSizeKbytes); } ~MemValue () { @@ -35,10 +35,10 @@ namespace{ } protected: virtual void free() { - if(_value != NULL) + if(this->_value != NULL) { - ::free(_value); - _value = NULL; + ::free(this->_value); + this->_value = NULL; } } }; @@ -218,11 +218,11 @@ namespace{ //LPTSTR pPrinterName; ADD_V8_STRING_PROPERTY(name, pPrinterName) //LPTSTR pPrinterName; - ADD_V8_STRING_PROPERTY(printerName, pPrinterName); + ADD_V8_STRING_PROPERTY(printerName, pPrinterName) //LPTSTR pUserName; - ADD_V8_STRING_PROPERTY(user, pUserName); + ADD_V8_STRING_PROPERTY(user, pUserName) //LPTSTR pDatatype; - ADD_V8_STRING_PROPERTY(format, pDatatype); + ADD_V8_STRING_PROPERTY(format, pDatatype) //DWORD Priority; Nan::Set(result_printer_job, V8_STRING_NEW_UTF8("priority"), V8_VALUE_NEW(Number, job->Priority)); //DWORD Size; @@ -246,17 +246,17 @@ namespace{ // Specific fields //LPTSTR pMachineName; - ADD_V8_STRING_PROPERTY(machineName, pMachineName); + ADD_V8_STRING_PROPERTY(machineName, pMachineName) //LPTSTR pDocument; - ADD_V8_STRING_PROPERTY(document, pDocument); + ADD_V8_STRING_PROPERTY(document, pDocument) //LPTSTR pNotifyName; - ADD_V8_STRING_PROPERTY(notifyName, pNotifyName); + ADD_V8_STRING_PROPERTY(notifyName, pNotifyName) //LPTSTR pPrintProcessor; - ADD_V8_STRING_PROPERTY(printProcessor, pPrintProcessor); + ADD_V8_STRING_PROPERTY(printProcessor, pPrintProcessor) //LPTSTR pParameters; - ADD_V8_STRING_PROPERTY(parameters, pParameters); + ADD_V8_STRING_PROPERTY(parameters, pParameters) //LPTSTR pDriverName; - ADD_V8_STRING_PROPERTY(driverName, pDriverName); + ADD_V8_STRING_PROPERTY(driverName, pDriverName) #undef ADD_V8_STRING_PROPERTY //LPDEVMODE pDevMode; //PSECURITY_DESCRIPTOR pSecurityDescriptor; From c605736d00596c556369e096371112bfc38bfd61 Mon Sep 17 00:00:00 2001 From: Stephen Carlin Date: Wed, 30 Apr 2025 21:37:13 -0400 Subject: [PATCH 2/7] Remove patch-package dependency and apply Electron 33 compatibility fixes directly to code --- .github/workflows/prebuild-main.yml | 3 --- .github/workflows/prebuild-pr.yml | 3 --- binding.gyp | 3 ++- package.json | 6 ++---- patches/electron-v8-macros.patch | 26 -------------------------- patches/node-abi+3.8.0.patch | 13 ------------- 6 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 patches/electron-v8-macros.patch delete mode 100644 patches/node-abi+3.8.0.patch diff --git a/.github/workflows/prebuild-main.yml b/.github/workflows/prebuild-main.yml index dd69b982..2097365e 100644 --- a/.github/workflows/prebuild-main.yml +++ b/.github/workflows/prebuild-main.yml @@ -23,7 +23,6 @@ jobs: - run: npm i - name: Prebuild run: | - npm run apply-patches npm run prebuild -- --strip --all --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} npm run prebuild -- --strip --all --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} @@ -40,7 +39,6 @@ jobs: - run: npm i - name: Prebuild run: | - npm run apply-patches npm run prebuild -- --strip --all --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} prebuild-windows: @@ -55,7 +53,6 @@ jobs: - run: npm i - name: Prebuild run: | - npm run apply-patches npm run prebuild -- --strip --all --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} npm run prebuild -- --strip --all --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} diff --git a/.github/workflows/prebuild-pr.yml b/.github/workflows/prebuild-pr.yml index 09b9982c..29a452eb 100644 --- a/.github/workflows/prebuild-pr.yml +++ b/.github/workflows/prebuild-pr.yml @@ -21,7 +21,6 @@ jobs: - run: npm i - name: Prebuild run: | - npm run apply-patches npm run prebuild -- --strip --all --arch ia32 npm run prebuild -- --strip --all --arch x64 npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch ia32 @@ -38,7 +37,6 @@ jobs: - run: npm i - name: Prebuild run: | - npm run apply-patches npm run prebuild -- --strip --all --arch x64 npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 prebuild-windows: @@ -53,7 +51,6 @@ jobs: - run: npm i - name: Prebuild run: | - npm run apply-patches npm run prebuild -- --strip --all --arch ia32 npm run prebuild -- --strip --all --arch x64 npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch ia32 diff --git a/binding.gyp b/binding.gyp index f3bf28f8..8f04ec8c 100644 --- a/binding.gyp +++ b/binding.gyp @@ -25,7 +25,8 @@ 'include_dirs' : [ "= 20.0.0" }, "scripts": { - "install": "npm run apply-patches && prebuild-install || node-gyp rebuild", - "apply-patches": "patch-package", + "install": "prebuild-install || node-gyp rebuild", "prebuild-all": "prebuild --all --force --strip --verbose --openssl_fips=X", "prebuild": "prebuild", "prebuild-electron": "prebuild --runtime electron --target 33.0.0 --strip --verbose", diff --git a/patches/electron-v8-macros.patch b/patches/electron-v8-macros.patch deleted file mode 100644 index 8aa02b5c..00000000 --- a/patches/electron-v8-macros.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/binding.gyp b/binding.gyp -index 2276..2376 100644 ---- a/binding.gyp -+++ b/binding.gyp -@@ -25,7 +25,8 @@ - 'include_dirs' : [ - " Date: Thu, 1 May 2025 10:48:07 -0400 Subject: [PATCH 3/7] Clean up some changes not needed and add gitignore file, it was missed in prior commits --- .github/workflows/prebuild-main.yml | 5 ----- .github/workflows/prebuild-pr.yml | 5 ----- .idea/.gitignore | 10 ++++++++++ package.json | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 .idea/.gitignore diff --git a/.github/workflows/prebuild-main.yml b/.github/workflows/prebuild-main.yml index 2097365e..cd76da94 100644 --- a/.github/workflows/prebuild-main.yml +++ b/.github/workflows/prebuild-main.yml @@ -25,8 +25,6 @@ jobs: run: | npm run prebuild -- --strip --all --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} npm run prebuild -- --strip --all --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} - npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} - npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} prebuild-macos: name: Prebuild Binaries for macOS runs-on: macos-latest @@ -40,7 +38,6 @@ jobs: - name: Prebuild run: | npm run prebuild -- --strip --all --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} - npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} prebuild-windows: name: Prebuild Binaries for Windows runs-on: windows-latest @@ -55,5 +52,3 @@ jobs: run: | npm run prebuild -- --strip --all --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} npm run prebuild -- --strip --all --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} - npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} - npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} diff --git a/.github/workflows/prebuild-pr.yml b/.github/workflows/prebuild-pr.yml index 29a452eb..5ccd6625 100644 --- a/.github/workflows/prebuild-pr.yml +++ b/.github/workflows/prebuild-pr.yml @@ -23,8 +23,6 @@ jobs: run: | npm run prebuild -- --strip --all --arch ia32 npm run prebuild -- --strip --all --arch x64 - npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch ia32 - npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 prebuild-macos: name: Prebuild Binaries for macOS runs-on: macos-latest @@ -38,7 +36,6 @@ jobs: - name: Prebuild run: | npm run prebuild -- --strip --all --arch x64 - npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 prebuild-windows: name: Prebuild Binaries for Windows runs-on: windows-latest @@ -53,5 +50,3 @@ jobs: run: | npm run prebuild -- --strip --all --arch ia32 npm run prebuild -- --strip --all --arch x64 - npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch ia32 - npm run prebuild -- --runtime electron --target 33.0.0 --strip --arch x64 diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..7bc07ec2 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Environment-dependent path to Maven home directory +/mavenHomeManager.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/package.json b/package.json index f6f82912..19627b6e 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "install": "prebuild-install || node-gyp rebuild", "prebuild-all": "prebuild --all --force --strip --verbose --openssl_fips=X", "prebuild": "prebuild", - "prebuild-electron": "prebuild --runtime electron --target 33.0.0 --strip --verbose", + "prebuild-electron": "prebuild --strip --verbose", "rebuild": "node-gyp rebuild", "test": "nodeunit test" }, From 5a9fd1362535f5248fa042a27ffa9eb1f8a1c87c Mon Sep 17 00:00:00 2001 From: Steven Lehn Date: Thu, 1 May 2025 11:50:17 -0500 Subject: [PATCH 4/7] add .idea to gitignore --- .gitignore | 3 ++- .idea/.gitignore | 10 ---------- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 .idea/.gitignore diff --git a/.gitignore b/.gitignore index 72d91f8f..33fc3a1d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ node_modules *.swp *.log prebuilds -.prebuildrc \ No newline at end of file +.prebuildrc +.idea diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 7bc07ec2..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Environment-dependent path to Maven home directory -/mavenHomeManager.xml -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml From 750f9ef7e1c83102db7f8181e4f7bb9d31ee4bdb Mon Sep 17 00:00:00 2001 From: Steven Lehn Date: Thu, 1 May 2025 11:50:33 -0500 Subject: [PATCH 5/7] update build tasks to run with node20 --- .github/workflows/prebuild-main.yml | 12 ++++++------ .github/workflows/prebuild-pr.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/prebuild-main.yml b/.github/workflows/prebuild-main.yml index cd76da94..f72c0291 100644 --- a/.github/workflows/prebuild-main.yml +++ b/.github/workflows/prebuild-main.yml @@ -16,9 +16,9 @@ jobs: sudo dpkg --add-architecture i386 sudo apt-get update -y -qq sudo apt-get install -y g++-multilib gcc-multilib libcups2-dev libcups2-dev:i386 libc6-dev-i386 linux-libc-dev linux-libc-dev:i386 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: - node-version: 16.x + node-version: 20.x - uses: actions/checkout@v1 - run: npm i - name: Prebuild @@ -30,9 +30,9 @@ jobs: runs-on: macos-latest timeout-minutes: 30 steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: - node-version: 16.x + node-version: 20.x - uses: actions/checkout@v1 - run: npm i - name: Prebuild @@ -43,9 +43,9 @@ jobs: runs-on: windows-latest timeout-minutes: 30 steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: - node-version: 16.x + node-version: 20.x - uses: actions/checkout@v1 - run: npm i - name: Prebuild diff --git a/.github/workflows/prebuild-pr.yml b/.github/workflows/prebuild-pr.yml index 5ccd6625..c079589e 100644 --- a/.github/workflows/prebuild-pr.yml +++ b/.github/workflows/prebuild-pr.yml @@ -14,9 +14,9 @@ jobs: sudo dpkg --add-architecture i386 sudo apt-get update -y -qq sudo apt-get install -y g++-multilib gcc-multilib libcups2-dev libcups2-dev:i386 libc6-dev-i386 linux-libc-dev linux-libc-dev:i386 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: - node-version: 16.x + node-version: 20.x - uses: actions/checkout@v1 - run: npm i - name: Prebuild @@ -28,9 +28,9 @@ jobs: runs-on: macos-latest timeout-minutes: 30 steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: - node-version: 16.x + node-version: 20.x - uses: actions/checkout@v1 - run: npm i - name: Prebuild @@ -41,9 +41,9 @@ jobs: runs-on: windows-latest timeout-minutes: 30 steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: - node-version: 16.x + node-version: 20.x - uses: actions/checkout@v1 - run: npm i - name: Prebuild From be39317eb606cd9cb507eb3d353e3291219b5185 Mon Sep 17 00:00:00 2001 From: Steven Lehn Date: Thu, 1 May 2025 12:10:24 -0500 Subject: [PATCH 6/7] feat: update action versions, build for macos arm64, do not specify all --- .github/workflows/prebuild-main.yml | 17 +++++++++-------- .github/workflows/prebuild-pr.yml | 13 +++++++------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/prebuild-main.yml b/.github/workflows/prebuild-main.yml index f72c0291..57bf9a29 100644 --- a/.github/workflows/prebuild-main.yml +++ b/.github/workflows/prebuild-main.yml @@ -19,12 +19,12 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 20.x - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - run: npm i - name: Prebuild run: | - npm run prebuild -- --strip --all --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} - npm run prebuild -- --strip --all --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} + npm run prebuild -- --strip --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} + npm run prebuild -- --strip --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} prebuild-macos: name: Prebuild Binaries for macOS runs-on: macos-latest @@ -33,11 +33,12 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 20.x - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - run: npm i - name: Prebuild run: | - npm run prebuild -- --strip --all --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} + npm run prebuild -- --strip --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} + npm run prebuild -- --strip --arch arm64 -u ${{ secrets.PREBUILD_TOKEN }} prebuild-windows: name: Prebuild Binaries for Windows runs-on: windows-latest @@ -46,9 +47,9 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 20.x - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - run: npm i - name: Prebuild run: | - npm run prebuild -- --strip --all --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} - npm run prebuild -- --strip --all --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} + npm run prebuild -- --strip --arch ia32 -u ${{ secrets.PREBUILD_TOKEN }} + npm run prebuild -- --strip --arch x64 -u ${{ secrets.PREBUILD_TOKEN }} diff --git a/.github/workflows/prebuild-pr.yml b/.github/workflows/prebuild-pr.yml index c079589e..39d68a35 100644 --- a/.github/workflows/prebuild-pr.yml +++ b/.github/workflows/prebuild-pr.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 20.x - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - run: npm i - name: Prebuild run: | @@ -31,11 +31,12 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 20.x - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - run: npm i - name: Prebuild run: | - npm run prebuild -- --strip --all --arch x64 + npm run prebuild -- --strip --arch x64 + npm run prebuild -- --strip --arch arm64 prebuild-windows: name: Prebuild Binaries for Windows runs-on: windows-latest @@ -44,9 +45,9 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 20.x - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - run: npm i - name: Prebuild run: | - npm run prebuild -- --strip --all --arch ia32 - npm run prebuild -- --strip --all --arch x64 + npm run prebuild -- --strip --arch ia32 + npm run prebuild -- --strip --arch x64 From 9d0c48a2e039abd3106abb36142d7f4f34f45d5f Mon Sep 17 00:00:00 2001 From: Steven Lehn Date: Thu, 1 May 2025 12:12:32 -0500 Subject: [PATCH 7/7] fix: remove --all from linux --- .github/workflows/prebuild-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prebuild-pr.yml b/.github/workflows/prebuild-pr.yml index 39d68a35..feb4ab0e 100644 --- a/.github/workflows/prebuild-pr.yml +++ b/.github/workflows/prebuild-pr.yml @@ -21,8 +21,8 @@ jobs: - run: npm i - name: Prebuild run: | - npm run prebuild -- --strip --all --arch ia32 - npm run prebuild -- --strip --all --arch x64 + npm run prebuild -- --strip --arch ia32 + npm run prebuild -- --strip --arch x64 prebuild-macos: name: Prebuild Binaries for macOS runs-on: macos-latest