fix: notarize.jsのnotarizeインポート位置を修正し、依存関係を更新

feat: Raspberry Pi用のビルドワークフローを整理し、arm64およびarmv7lのビルド手順を追加
chore: package.jsonおよびpackage-lock.jsonの依存関係を更新

Author: kiyu-git

.erb/scripts/notarize.js

@@ -1,4 +1,3 @@
-const { notarize } = require('@electron/notarize');
 const { build } = require('../../package.json');
 
 exports.default = async function notarizeMacos(context) {
@@ -7,6 +6,8 @@ exports.default = async function notarizeMacos(context) {
     return;
   }
 
+  const { notarize } = require('@electron/notarize');
+
   if (process.env.CI !== 'true') {
     console.warn('Skipping notarizing step. Packaging is not running in CI');
     return;

.github/workflows/publish-raspberrypi.yml

@@ -1,36 +1,81 @@
-name: Publish Raspberry Pi (arm64)
+name: Publish Raspberry Pi
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
+  # Job 1: arm64のビルド
   build-arm64:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
+      - name: Checkout git repo
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
           platforms: arm64
 
-      - name: Build for arm64
+      - name: Install build tools
+        run: sudo apt-get install -y build-essential
+
+      - name: Install libfuse2
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libfuse2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Install serialport from source
+        run: |
+          cd release/app
+          npm install serialport --build-from-source --arch=arm64
+
+      - name: Build application
+        run: npm run build
+
+      - name: Build and publish for arm64
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          npm exec electron-builder -- --publish always --arm64
+
+  # Job 2: armv7lのビルド
+  build-armv7l:
+    runs-on: ubuntu-latest
+    steps:
+      # 1. ソースコードをチェックアウト
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # 2. arm32v7 Dockerコンテナ内でビルドと公開の全工程を実行
+      - name: Build and Publish inside arm32v7 container
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          docker run --rm -t \
-            --platform linux/arm64 \
-            -v $PWD:/app \
-            -w /app \
-            node:18-bullseye \
-            bash -c "
-              npm install &&
-              npm run postinstall &&
-              npx electron-rebuild &&
-              npm run build &&
-              npx electron-builder --arm64 --publish always
-            "
+          docker run --rm \
+            -v ${{ github.workspace }}:/workspace \
+            -w /workspace \
+            -e GH_TOKEN \
+            arm32v7/node:18 \
+            /bin/bash -c '
+              set -e
+              echo "--- Installing root dependencies ---"
+              npm install --arch=armv7l
+              echo "--- Rebuilding native modules ---"
+              cd release/app && npm install
+              cd ../..
+              echo "--- Building application (TS -> JS) ---"
+              npm run build
+              echo "--- Packaging and publishing application for armv7l ---"
+              npm exec electron-builder -- --publish always --armv7l
+            '

package-lock.json

@@ -147,7 +147,7 @@
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.0",
     "detect-port": "^1.5.1",
-    "electron": "^25.0.1",
+    "electron": "25.0.1",
     "electron-builder": "^24.2.1",
     "electron-devtools-installer": "^3.2.0",
     "electronmon": "^2.0.2",