update dependencies, add arm64 build

Author: zawata

.github/workflows/rebuildElectron.yml

@@ -17,19 +17,18 @@ jobs:
         run: echo ${{ github.ref }}
 
       - name: Install Dependencies for Ubuntu
-        # git >= 2.18 required for actions/checkout git support
         run: apt update && apt install -y software-properties-common git wget build-essential clang python3 libkrb5-dev libc++-dev zlib1g-dev libssl-dev
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
       - uses: actions/checkout@v4
 
-      - name: Use Node.js 20
+      - name: Use Node.js 22
         uses: actions/setup-node@v4
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: true
         with:
-          node-version: 20
+          node-version: 22
           architecture: ${{ matrix.arch }}
 
       - run: git config --global --add safe.directory /__w/electron-npg-automator/electron-npg-automator
@@ -44,7 +43,6 @@ jobs:
           CXX: clang++
           npm_config_clang: 1
           GYP_DEFINES: use_obsolete_asm=true
-          BUILD_ONLY: true
           electron_npg_automator_module: nodegit/nodegit
           electron_npg_automator_use_git_clone: true
       - run: node ci/deploy.js
@@ -57,18 +55,16 @@ jobs:
           CXX: clang++
           npm_config_clang: 1
           GYP_DEFINES: use_obsolete_asm=true
-          BUILD_ONLY: true
           electron_npg_automator_module: nodegit/nodegit
           electron_npg_automator_use_git_clone: true
 
   rebuild-windows:
     name: Rebuild Windows
     strategy:
       matrix:
-        os: [windows-2022]
-        arch: [x64]
+        arch: [x64, arm64]
       fail-fast: false
-    runs-on: ${{ matrix.os }}
+    runs-on: windows-latest
     steps:
       - name: Print Tag Ref
         run: echo ${{ github.ref }}
@@ -96,39 +92,39 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.node_pre_gyp_accessKeyId }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.node_pre_gyp_secretAccessKey }}
           GYP_DEFINES: use_obsolete_asm=true
-          BUILD_ONLY: true
           electron_npg_automator_module: nodegit/nodegit
           electron_npg_automator_use_git_clone: true
+          TARGET_ARCH: ${{ matrix.arch }}
       - run: node ci/deploy.js
         env:
           electron_npg_automator_gh_token: ${{ secrets.electron_npg_automator_gh_token }}
           node_pre_gyp_bucket: ${{ secrets.node_pre_gyp_bucket }}
           AWS_ACCESS_KEY_ID: ${{ secrets.node_pre_gyp_accessKeyId }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.node_pre_gyp_secretAccessKey }}
           GYP_DEFINES: use_obsolete_asm=true
-          BUILD_ONLY: true
           electron_npg_automator_module: nodegit/nodegit
           electron_npg_automator_use_git_clone: true
+          TARGET_ARCH: ${{ matrix.arch }}
 
   rebuild-macos:
     name: Rebuild macOS
     strategy:
       matrix:
         arch: [x64, arm64]
       fail-fast: false
-    runs-on: ${{ matrix.arch == 'arm64' && 'macos-14' || 'macos-13' }}
+    runs-on: ${{ matrix.arch == 'x64' && 'macos-15-intel' || 'macos-15' }}
     steps:
       - name: Print Tag Ref
         run: echo ${{ github.ref }}
 
       - uses: actions/checkout@v4
 
-      - name: Use Node.js 20
+      - name: Use Node.js 22
         uses: actions/setup-node@v4
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: true
         with:
-          node-version: 20
+          node-version: 22
           architecture: ${{ matrix.arch }}
 
       - name: Use Python 3.11 # node-gyp < 10 breaks with 3.12
@@ -147,7 +143,6 @@ jobs:
           CXX: clang++
           npm_config_clang: 1
           GYP_DEFINES: use_obsolete_asm=true
-          BUILD_ONLY: true
           electron_npg_automator_module: nodegit/nodegit
           electron_npg_automator_use_git_clone: true
       - run: node ci/deploy.js
@@ -160,6 +155,5 @@ jobs:
           CXX: clang++
           npm_config_clang: 1
           GYP_DEFINES: use_obsolete_asm=true
-          BUILD_ONLY: true
           electron_npg_automator_module: nodegit/nodegit
           electron_npg_automator_use_git_clone: true

ci/build.js

@@ -1,33 +1,21 @@
 const cp = require('child_process');
-const fs = require('fs');
+const getTagInfo = require('../util/get-tag-info');
+const modulePath = require('../util/module-path');
+const moduleParentPath = require('../util/module-parent-path');
 const path = require('path');
+const {installNodeHeaders, rebuildNativeModules} = require('electron-rebuild');
 
-module.exports = function(electronVersion, moduleParentPath, modulePath) {
+function build (electronVersion, moduleParentPath, modulePath) {
   return new Promise(function(resolve, reject) {
     let npmrc = 'runtime = electron\n';
     npmrc += 'disturl = https://electronjs.org/headers\n';
     npmrc += `target = ${electronVersion.replace('v', '')}`;
+    if (process.env.TARGET_ARCH) {
+      npmrc += `\ntarget_arch = ${process.env.TARGET_ARCH}`;
+    }
 
     fs.writeFileSync(path.join(modulePath, '.npmrc'), npmrc);
 
-    if (process.platform === 'win32') {
-      cp.exec(
-        'npm install',
-        {cwd: modulePath, maxBuffer: Number.MAX_VALUE},
-        function(err, stdout, stderr) {
-          console.log(stdout);
-          console.error(stderr);
-          if (err) {
-            reject(err);
-          }
-          else {
-            resolve();
-          }
-        }
-      );
-      return;
-    }
-
     const spawnedNPM = cp.spawn(
       'npm',
       ['install'],
@@ -45,3 +33,15 @@ module.exports = function(electronVersion, moduleParentPath, modulePath) {
     })
   });
 };
+
+getTagInfo()
+  .then(({electronVersion}) => {
+    electronVersion = electronVersion.replace('v', '');
+
+    return buildScript(electronVersion, moduleParentPath(), modulePath());
+  })
+  .catch (e => {
+    console.error('Error building:');
+    console.error(e);
+    process.exit(1);
+  });