Skip to content

Commit 1e44d8c

Browse files
geodicEugeny
andauthoredDec 31, 2024··
Bump Electron to 32 as 29 is EOL (#10118)
Co-authored-by: Eugene <inbox@null.page>
1 parent a10e9c0 commit 1e44d8c

File tree

5 files changed

+27
-46
lines changed

5 files changed

+27
-46
lines changed
 

‎.github/workflows/build.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Package-Build
22
on: [push, pull_request]
33
jobs:
44
Lint:
5-
runs-on: ubuntu-20.04
5+
runs-on: ubuntu-24.04
66

77
steps:
88
- name: Checkout
@@ -17,6 +17,7 @@ jobs:
1717

1818
- name: Install deps
1919
run: |
20+
sudo apt-get update && sudo apt-get install -y libfontconfig1-dev
2021
npm i -g yarn
2122
cd app
2223
yarn
@@ -129,7 +130,7 @@ jobs:
129130
path: artifact-zip
130131

131132
Linux-Build:
132-
runs-on: ubuntu-20.04
133+
runs-on: ubuntu-24.04
133134
needs: Lint
134135
strategy:
135136
matrix:
@@ -171,7 +172,7 @@ jobs:
171172
- name: Install dependencies
172173
run: |
173174
sudo apt-get update
174-
sudo apt-get install libarchive-tools zsh crossbuild-essential-${{matrix.arch}}
175+
sudo apt-get install libfontconfig1-dev libarchive-tools zsh crossbuild-essential-${{matrix.arch}}
175176
176177
- name: Setup tar to run as root
177178
run: sudo chmod u+s "$(command -v tar)"

‎app/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@
6565
},
6666
"resolutions": {
6767
"*/node-abi": "^3",
68-
"node-gyp": "^10.0.0"
68+
"node-gyp": "^10.0.0",
69+
"nan": "2.22.0",
70+
"node-addon-api": "^8.3.0"
6971
}
7072
}

‎app/yarn.lock

+8-23
Original file line numberDiff line numberDiff line change
@@ -2600,10 +2600,10 @@ mz@^2.7.0:
26002600
object-assign "^4.0.1"
26012601
thenify-all "^1.0.0"
26022602

2603-
nan@^2.17.0:
2604-
version "2.20.0"
2605-
resolved "https://registry.yarnpkg.com/nan/-/nan-2.20.0.tgz#08c5ea813dd54ed16e5bd6505bf42af4f7838ca3"
2606-
integrity sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==
2603+
nan@2.22.0, nan@^2.17.0:
2604+
version "2.22.0"
2605+
resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3"
2606+
integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==
26072607

26082608
napi-build-utils@^1.0.1:
26092609
version "1.0.2"
@@ -2648,25 +2648,10 @@ node-abi@^3.3.0:
26482648
dependencies:
26492649
semver "^7.3.5"
26502650

2651-
node-addon-api@3.1.0, node-addon-api@^3.0.2, node-addon-api@^3.1.0:
2652-
version "3.1.0"
2653-
resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz"
2654-
integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==
2655-
2656-
node-addon-api@6.1.0:
2657-
version "6.1.0"
2658-
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
2659-
integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
2660-
2661-
node-addon-api@^4.0.0, node-addon-api@^4.3.0:
2662-
version "4.3.0"
2663-
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
2664-
integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
2665-
2666-
node-addon-api@^7.1.0:
2667-
version "7.1.1"
2668-
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
2669-
integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
2651+
node-addon-api@3.1.0, node-addon-api@6.1.0, node-addon-api@^3.0.2, node-addon-api@^3.1.0, node-addon-api@^4.0.0, node-addon-api@^4.3.0, node-addon-api@^7.1.0, node-addon-api@^8.3.0:
2652+
version "8.3.0"
2653+
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.3.0.tgz#ec3763f18befc1cdf66d11e157ce44d5eddc0603"
2654+
integrity sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==
26702655

26712656
node-fetch-npm@^2.0.2:
26722657
version "2.0.4"

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"cross-env": "7.0.3",
4040
"css-loader": "^6.7.3",
4141
"deep-equal": "2.0.5",
42-
"electron": "^29",
42+
"electron": "^32.2.7",
4343
"electron-builder": "^24.6.4",
4444
"electron-download": "^4.1.1",
4545
"electron-installer-snap": "^5.1.0",
@@ -55,7 +55,7 @@
5555
"lru-cache": "^6.0.0",
5656
"macos-release": "^3.3.0",
5757
"ngx-toastr": "^16.0.2",
58-
"node-abi": "^3.65.0",
58+
"node-abi": "^3.71.0",
5959
"npmlog": "6.0.2",
6060
"npx": "^10.2.2",
6161
"patch-package": "^6.4.7",
@@ -96,7 +96,7 @@
9696
"*/pug": "^3",
9797
"lzma-native": "^8.0.6",
9898
"**/graceful-fs": "^4.2.4",
99-
"nan": "2.17.0",
99+
"nan": "2.22.0",
100100
"node-gyp": "^10.0.0"
101101
},
102102
"scripts": {

‎yarn.lock

+9-16
Original file line numberDiff line numberDiff line change
@@ -3155,10 +3155,10 @@ electron-to-chromium@^1.4.284:
31553155
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.286.tgz#0e039de59135f44ab9a8ec9025e53a9135eba11f"
31563156
integrity sha512-Vp3CVhmYpgf4iXNKAucoQUDcCrBQX3XLBtwgFqP9BUXuucgvAV9zWp1kYU7LL9j4++s9O+12cb3wMtN4SJy6UQ==
31573157

3158-
electron@^29:
3159-
version "29.4.5"
3160-
resolved "https://registry.yarnpkg.com/electron/-/electron-29.4.5.tgz#b83bbeee6fc722dbbaab30d3a6bc8e982c9ab98d"
3161-
integrity sha512-DlEuzGbWBYl1Qr0qUYgNZdoixJg4YGHy2HC6fkRjSXSlb01UrQ5ORi8hNLzelzyYx8rNQyyE3zDUuk9EnZwYuA==
3158+
electron@^32.2.7:
3159+
version "32.2.7"
3160+
resolved "https://registry.yarnpkg.com/electron/-/electron-32.2.7.tgz#4eaf78534c99ba060da5bb002c737206be33f225"
3161+
integrity sha512-y8jbQRG3xogF70XPlk5c+dWe5iRfUBo28o2NMpKd/CcW7ENIaWtBlGima8/8nmRdAaYTy1+yIt6KB0Lon9H8cA==
31623162
dependencies:
31633163
"@electron/get" "^2.0.0"
31643164
"@types/node" "^20.9.0"
@@ -6176,10 +6176,10 @@ mute-stream@~0.0.4:
61766176
resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"
61776177
integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
61786178

6179-
nan@2.17.0:
6180-
version "2.17.0"
6181-
resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
6182-
integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
6179+
nan@2.22.0:
6180+
version "2.22.0"
6181+
resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3"
6182+
integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==
61836183

61846184
nanoid@^3.3.4:
61856185
version "3.3.4"
@@ -6221,20 +6221,13 @@ no-case@^3.0.4:
62216221
lower-case "^2.0.2"
62226222
tslib "^2.0.3"
62236223

6224-
node-abi@^3.45.0:
6224+
node-abi@^3.45.0, node-abi@^3.71.0:
62256225
version "3.71.0"
62266226
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.71.0.tgz#52d84bbcd8575efb71468fbaa1f9a49b2c242038"
62276227
integrity sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==
62286228
dependencies:
62296229
semver "^7.3.5"
62306230

6231-
node-abi@^3.65.0:
6232-
version "3.65.0"
6233-
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.65.0.tgz#ca92d559388e1e9cab1680a18c1a18757cdac9d3"
6234-
integrity sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==
6235-
dependencies:
6236-
semver "^7.3.5"
6237-
62386231
node-addon-api@^1.6.3:
62396232
version "1.7.2"
62406233
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"

0 commit comments

Comments
 (0)
Please sign in to comment.