fix electron builds

This commit is contained in:
plebeius
2026-01-30 13:21:41 +08:00
parent 388a120c8e
commit 01aac36cfa
4 changed files with 12 additions and 52 deletions
+1 -1
View File
@@ -128,7 +128,7 @@ jobs:
with:
# needed for git commit history changelog
fetch-depth: 0
- name: Setup Node.js v22 # electron-rebuild needs Node 22+
- name: Setup Node.js v22
uses: actions/setup-node@v2
with:
node-version: 22
+3 -3
View File
@@ -35,7 +35,7 @@ RUN yarn build
# build electron-forge docker image
# temporary .dockerignore to save build time
echo $'node_modules\nbuild\nout' > .dockerignore
echo $'node_modules\ndist' > .dockerignore
echo "$dockerfile" | sudo docker build \
. \
--tag 5chan-electron-forge \
@@ -45,7 +45,7 @@ rm .dockerignore
# build linux binary
sudo docker run \
--name 5chan-electron-forge \
--volume "$root_path"/out:/usr/src/5chan/out \
--volume "$root_path"/dist:/usr/src/5chan/dist \
--rm \
5chan-electron-forge \
yarn electron:build:linux
@@ -53,7 +53,7 @@ sudo docker run \
# build windows binary
sudo docker run \
--name 5chan-electron-forge \
--volume "$root_path"/out:/usr/src/5chan/out \
--volume "$root_path"/dist:/usr/src/5chan/dist \
--rm \
5chan-electron-forge \
yarn electron:build:windows
+6 -3
View File
@@ -59,7 +59,7 @@
"preview": "vite preview",
"analyze-bundle": "cross-env PUBLIC_URL=./ GENERATE_SOURCEMAP=true vite build && npx source-map-explorer 'dist/assets/*.js'",
"electron": "yarn build:preload && cross-env ELECTRON_IS_DEV=1 yarn electron:before && cross-env ELECTRON_IS_DEV=1 electron .",
"electron:no-delete-data": "yarn electron:before:download-ipfs && electron .",
"electron:no-delete-data": "yarn build:preload && electron .",
"electron:start": "concurrently \"cross-env BROWSER=none yarn start\" \"wait-on http://localhost:3000 && yarn electron\"",
"electron:start:no-delete-data": "concurrently \"cross-env BROWSER=none yarn start\" \"wait-on http://localhost:3000 && yarn electron:no-delete-data\"",
"electron:package": "yarn build && yarn build:preload && electron-forge package",
@@ -67,7 +67,11 @@
"electron:build:linux": "yarn build && yarn build:preload && electron-forge make --platform=linux",
"electron:build:mac": "yarn build && yarn build:preload && electron-forge make --platform=darwin",
"electron:build:windows": "yarn build && yarn build:preload && electron-forge make --platform=win32",
"electron:before": "yarn electron-rebuild && yarn electron:before:delete-data",
"electron:build:linux:x64": "yarn build && yarn build:preload && electron-forge make --platform=linux --arch=x64",
"electron:build:linux:arm64": "yarn build && yarn build:preload && electron-forge make --platform=linux --arch=arm64",
"electron:build:mac:x64": "yarn build && yarn build:preload && electron-forge make --platform=darwin --arch=x64",
"electron:build:mac:arm64": "yarn build && yarn build:preload && electron-forge make --platform=darwin --arch=arm64",
"electron:before": "yarn electron:before:delete-data",
"electron:before:delete-data": "rimraf .plebbit",
"android:build:icons": "cordova-res android --skip-config --copy --resources /tmp/plebbit-react-android-icons --icon-source ./android/icons/icon.png --splash-source ./android/icons/splash.png --icon-foreground-source ./android/icons/icon-foreground.png --icon-background-source '#ffffee'",
"lint": "oxlint src/**/*.{js,ts,tsx}",
@@ -96,7 +100,6 @@
"@capacitor/android": "7.4.5",
"@capacitor/cli": "7.4.5",
"@capacitor/core": "7.4.5",
"@electron/rebuild": "4.0.0",
"@react-scan/vite-plugin-react-scan": "0.1.8",
"@types/memoizee": "0.4.9",
"@typescript/native-preview": "^7.0.0-dev.20251226.1",
+2 -45
View File
@@ -1492,22 +1492,6 @@
optionalDependencies:
global-agent "^3.0.0"
"@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2":
version "10.2.0-electron.1"
uid "06b29aafb7708acef8b3669835c8a7857ebc92d2"
resolved "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2"
dependencies:
env-paths "^2.2.0"
exponential-backoff "^3.1.1"
glob "^8.1.0"
graceful-fs "^4.2.6"
make-fetch-happen "^10.2.1"
nopt "^6.0.0"
proc-log "^2.0.1"
semver "^7.3.5"
tar "^6.2.1"
which "^2.0.2"
"@electron/node-gyp@https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2":
version "10.2.0-electron.1"
resolved "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2"
@@ -1571,26 +1555,6 @@
semver "^7.1.3"
yargs-parser "^21.1.1"
"@electron/rebuild@4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-4.0.0.tgz#5406c189c38f8af7b755f4dff01e7e3df5f0711f"
integrity sha512-ilVZIehe+CzmAEVZCcblKzmZTbxNfyv1BQbqXxuhCUJH42468VtVt1Q9qM9OroZuwAdAh1MqjFrXwWjwxPJo/w==
dependencies:
"@electron/node-gyp" "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2"
"@malept/cross-spawn-promise" "^2.0.0"
chalk "^4.0.0"
debug "^4.1.1"
detect-libc "^2.0.1"
got "^11.7.0"
graceful-fs "^4.2.11"
node-abi "^4.2.0"
node-api-version "^0.2.1"
ora "^5.1.0"
read-binary-file-arch "^1.0.6"
semver "^7.3.5"
tar "^6.0.5"
yargs "^17.0.1"
"@electron/rebuild@^3.7.0":
version "3.7.2"
resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.7.2.tgz#8d808b29159c50086d27a5dec72b40bf16b4b582"
@@ -8833,7 +8797,7 @@ got@^11.7.0, got@^11.8.5:
p-cancelable "^2.0.0"
responselike "^2.0.0"
graceful-fs@^4.1.10, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
graceful-fs@^4.1.10, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
version "4.2.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -12023,19 +11987,12 @@ node-abi@^3.45.0:
dependencies:
semver "^7.3.5"
node-abi@^4.2.0:
version "4.14.0"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-4.14.0.tgz#7846b36a732f1afa221be3ca0e6248448bc111ef"
integrity sha512-E4n91K4Nk1Rch2KzD+edU2bfZTP4W42GypAUDXU4vu1A+4u9PvUNDkGI0dXbsy8ZeF3WGj0SD/uHxnXD/sW+3w==
dependencies:
semver "^7.6.3"
node-addon-api@^7.0.0:
version "7.1.1"
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
node-api-version@^0.2.0, node-api-version@^0.2.1:
node-api-version@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.1.tgz#19bad54f6d65628cbee4e607a325e4488ace2de9"
integrity sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q==