update dependencies, combine steps, add windows-arm64 build

zawata · zawata · commit 63dd31fbf599 · 2025-11-17T12:16:43.000-07:00
diff --git a/.github/workflows/rebuildElectron.yml b/.github/workflows/rebuildElectron.yml
@@ -17,24 +17,23 @@ 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
       - run: npm install
-      - run: node ci/build.js
+      - name: Build & Deploy
         env:
           electron_npg_automator_gh_token: ${{ secrets.electron_npg_automator_gh_token }}
           node_pre_gyp_bucket: ${{ secrets.node_pre_gyp_bucket }}
@@ -44,31 +43,19 @@ 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
-        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 }}
-          CC: clang
-          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/build.js
+          node ci/deploy.js
 
   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 }}
@@ -81,76 +68,54 @@ jobs:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: true
         with:
           node-version: 22
-          architecture: ${{ matrix.arch }}
 
       - name: Use Python 3.11 # node-gyp < 10 breaks with 3.12
         uses: actions/setup-python@v4
         with:
           python-version: '3.11'
 
       - run: npm install
-      - run: node ci/build.js
+      - name: Build & Deploy
         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
-      - 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 }}
+        run: |
+          node ci/build.js
+          node ci/deploy.js
 
   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
-          architecture: ${{ matrix.arch }}
+          node-version: 22
 
       - name: Use Python 3.11 # node-gyp < 10 breaks with 3.12
         uses: actions/setup-python@v4
         with:
           python-version: '3.11'
 
       - run: npm install
-      - run: node ci/build.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 }}
-          CC: clang
-          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
+      - name: Build & Deploy
         env:
           electron_npg_automator_gh_token: ${{ secrets.electron_npg_automator_gh_token }}
           node_pre_gyp_bucket: ${{ secrets.node_pre_gyp_bucket }}
@@ -160,6 +125,8 @@ 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/build.js
+          node ci/deploy.js
diff --git a/ci/build.js b/ci/build.js
@@ -1,41 +1,36 @@
+const fs = require('fs/promises');
 const cp = require('child_process');
-const fs = require('fs');
+const getTagInfo = require('../util/get-tag-info');
+const modulePath = require('../util/module-path');
 const path = require('path');
+const downloadModule = require('../util/download-module');
 
-module.exports = function(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', '')}`;
+(async () => {
+  await downloadModule();
+
+  const tagInfo = await getTagInfo();
+  const electronVersion = tagInfo.electronVersion.replace('v', '');
 
-    fs.writeFileSync(path.join(modulePath, '.npmrc'), npmrc);
+  let npmrc = 'runtime = electron\n';
+  npmrc += 'disturl = https://electronjs.org/headers\n';
+  npmrc += `target = ${electronVersion.replace('v', '')}`;
+  if (process.env.TARGET_ARCH) {
+    npmrc += `\narch = ${process.env.TARGET_ARCH}`;
+  }
 
-    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;
-    }
+  await fs.writeFile(path.join(modulePath(), '.npmrc'), npmrc);
 
+  return new Promise(function(resolve, reject) {
     const spawnedNPM = cp.spawn(
-      'npm',
-      ['install'],
-      { cwd: modulePath }
+      'npm install',
+      {
+        cwd: modulePath(),
+        shell: true
+      }
     );
 
-    spawnedNPM.stdout.on('data', data => console.log(data && data.toString().trim()));
-    spawnedNPM.stderr.on('data', data => console.log(data && data.toString().trim()));
+    spawnedNPM.stdout.on('data', data => console.log(data && data.toString()));
+    spawnedNPM.stderr.on('data', data => console.log(data && data.toString()));
     spawnedNPM.on('close', (code) => {
       if (code === 0) {
         resolve();
@@ -44,4 +39,4 @@ module.exports = function(electronVersion, moduleParentPath, modulePath) {
       }
     })
   });
-};
+})();
diff --git a/ci/prepare.js b/ci/prepare.js
