Skip to content

Commit 5a3832b

Browse files
TohruskyTohrusky
authored
ci: fix (#642)
* Update electron-builder.yml * pnpm fix * ci: update * update pkg resources * rename
1 parent 8a115e4 commit 5a3832b

File tree

12 files changed

+2701
-1788
lines changed

12 files changed

+2701
-1788
lines changed

‎.github/workflows/CI-build.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ jobs:
2121

2222
runs-on: windows-latest
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
with:
2626
submodules: recursive
2727

28-
- uses: actions/setup-node@v3
28+
- uses: actions/setup-node@v4
2929
with:
30-
node-version: 20
30+
node-version: 22
3131

32-
- uses: pnpm/action-setup@v2
32+
- uses: pnpm/action-setup@v4
3333
with:
34-
version: 8
34+
version: 10
3535

3636
- name: build
3737
run: |
@@ -53,21 +53,21 @@ jobs:
5353
7z a -r Final2x-windows-${{ matrix.os-version }}-unpacked.7z *
5454
5555
- name: upload-setup
56-
uses: actions/upload-artifact@v3
56+
uses: actions/upload-artifact@v4
5757
with:
5858
name: Final2x-windows-${{ matrix.os-version }}-setup
5959
path: dist/*.exe
6060

6161
- name: upload-unpacked-x64
6262
if: matrix.os-version == 'x64'
63-
uses: actions/upload-artifact@v3
63+
uses: actions/upload-artifact@v4
6464
with:
6565
name: Final2x-windows-${{ matrix.os-version }}-unpacked
6666
path: dist/win-unpacked/*.7z
6767

6868
- name: upload-unpacked-arm64
6969
if: matrix.os-version == 'arm64'
70-
uses: actions/upload-artifact@v3
70+
uses: actions/upload-artifact@v4
7171
with:
7272
name: Final2x-windows-${{ matrix.os-version }}-unpacked
7373
path: dist/win-arm64-unpacked/*.7z
@@ -79,17 +79,17 @@ jobs:
7979

8080
runs-on: macos-14
8181
steps:
82-
- uses: actions/checkout@v3
82+
- uses: actions/checkout@v4
8383
with:
8484
submodules: recursive
8585

86-
- uses: actions/setup-node@v3
86+
- uses: actions/setup-node@v4
8787
with:
88-
node-version: 20
88+
node-version: 22
8989

90-
- uses: pnpm/action-setup@v2
90+
- uses: pnpm/action-setup@v4
9191
with:
92-
version: 8
92+
version: 10
9393

9494
- name: build
9595
run: |
@@ -112,21 +112,21 @@ jobs:
112112
7z a -r Final2x-macos-${{ matrix.os-version }}-unpacked.7z *
113113
114114
- name: upload-dmg
115-
uses: actions/upload-artifact@v3
115+
uses: actions/upload-artifact@v4
116116
with:
117117
name: Final2x-macos-${{ matrix.os-version }}-dmg
118118
path: dist/*.dmg
119119

120120
- name: upload-unpacked-x64
121121
if: matrix.os-version == 'x64'
122-
uses: actions/upload-artifact@v3
122+
uses: actions/upload-artifact@v4
123123
with:
124124
name: Final2x-macos-${{ matrix.os-version }}-unpacked
125125
path: dist/mac/*.7z
126126

127127
- name: upload-unpacked-arm64
128128
if: matrix.os-version == 'arm64'
129-
uses: actions/upload-artifact@v3
129+
uses: actions/upload-artifact@v4
130130
with:
131131
name: Final2x-macos-${{ matrix.os-version }}-unpacked
132132
path: dist/mac-arm64/*.7z
@@ -136,19 +136,19 @@ jobs:
136136
matrix:
137137
os-version: ['x64']
138138

139-
runs-on: ubuntu-20.04
139+
runs-on: ubuntu-latest
140140
steps:
141-
- uses: actions/checkout@v3
141+
- uses: actions/checkout@v4
142142
with:
143143
submodules: recursive
144144

145-
- uses: actions/setup-node@v3
145+
- uses: actions/setup-node@v4
146146
with:
147-
node-version: 20
147+
node-version: 22
148148

149-
- uses: pnpm/action-setup@v2
149+
- uses: pnpm/action-setup@v4
150150
with:
151-
version: 8
151+
version: 10
152152

153153
- name: build
154154
run: |
@@ -164,25 +164,25 @@ jobs:
164164
7z a -r Final2x-linux-pip-${{ matrix.os-version }}-unpacked.7z *
165165
166166
- name: upload-snap
167-
uses: actions/upload-artifact@v3
167+
uses: actions/upload-artifact@v4
168168
with:
169169
name: Final2x-linux-pip-${{ matrix.os-version }}-snap
170170
path: dist/*.snap
171171

172172
- name: upload-AppImage
173-
uses: actions/upload-artifact@v3
173+
uses: actions/upload-artifact@v4
174174
with:
175175
name: Final2x-linux-pip-${{ matrix.os-version }}-AppImage
176176
path: dist/*.AppImage
177177

178178
- name: upload-deb
179-
uses: actions/upload-artifact@v3
179+
uses: actions/upload-artifact@v4
180180
with:
181181
name: Final2x-linux-pip-${{ matrix.os-version }}-deb
182182
path: dist/*.deb
183183

184184
- name: upload-unpacked
185-
uses: actions/upload-artifact@v3
185+
uses: actions/upload-artifact@v4
186186
with:
187187
name: Final2x-linux-pip-${{ matrix.os-version }}-unpacked
188188
path: dist/linux-unpacked/*.7z

‎.github/workflows/CI-test.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,28 @@ jobs:
1717
test:
1818
strategy:
1919
matrix:
20-
os-version: ['macos-latest', 'windows-latest', 'ubuntu-20.04']
20+
os-version: ['ubuntu-latest']
2121

2222
runs-on: ${{ matrix.os-version }}
2323
steps:
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
with:
2626
submodules: recursive
2727

28-
- uses: actions/setup-node@v3
28+
- uses: actions/setup-node@v4
2929
with:
30-
node-version: 20
30+
node-version: 22
3131

32-
- uses: pnpm/action-setup@v2
32+
- uses: pnpm/action-setup@v4
3333
with:
34-
version: 8
34+
version: 10
3535

3636
- name: Test
3737
run: |
3838
pnpm install
3939
pnpm run lint
4040
pnpm run typecheck
41-
pnpm run test-cov
41+
pnpm run test
4242
env:
4343
SKIP_DOWNLOAD_CORE: true
4444
GH_TOKEN: ${{ secrets.GH_TOKEN }}

‎.github/workflows/Release.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ jobs:
2020

2121
runs-on: windows-latest
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
with:
2525
submodules: recursive
2626

27-
- uses: actions/setup-node@v3
27+
- uses: actions/setup-node@v4
2828
with:
29-
node-version: 20
29+
node-version: 22
3030

31-
- uses: pnpm/action-setup@v2
31+
- uses: pnpm/action-setup@v4
3232
with:
33-
version: 8
33+
version: 10
3434

3535
- name: build
3636
run: |
@@ -58,19 +58,19 @@ jobs:
5858
shell: cmd
5959

6060
- name: upload-setup
61-
uses: actions/upload-artifact@v3
61+
uses: actions/upload-artifact@v4
6262
with:
6363
path: dist/*.exe
6464

6565
- name: upload-unpacked-x64
6666
if: matrix.os-version == 'x64'
67-
uses: actions/upload-artifact@v3
67+
uses: actions/upload-artifact@v4
6868
with:
6969
path: dist/win-unpacked/*.7z
7070

7171
- name: upload-unpacked-arm64
7272
if: matrix.os-version == 'arm64'
73-
uses: actions/upload-artifact@v3
73+
uses: actions/upload-artifact@v4
7474
with:
7575
path: dist/win-arm64-unpacked/*.7z
7676

@@ -81,17 +81,17 @@ jobs:
8181

8282
runs-on: macos-14
8383
steps:
84-
- uses: actions/checkout@v3
84+
- uses: actions/checkout@v4
8585
with:
8686
submodules: recursive
8787

88-
- uses: actions/setup-node@v3
88+
- uses: actions/setup-node@v4
8989
with:
90-
node-version: 20
90+
node-version: 22
9191

92-
- uses: pnpm/action-setup@v2
92+
- uses: pnpm/action-setup@v4
9393
with:
94-
version: 8
94+
version: 10
9595

9696
- name: build
9797
run: |
@@ -119,19 +119,19 @@ jobs:
119119
7z a -r Final2x-macos-${{ matrix.os-version }}-unpacked.7z *
120120
121121
- name: upload-dmg
122-
uses: actions/upload-artifact@v3
122+
uses: actions/upload-artifact@v4
123123
with:
124124
path: dist/*.dmg
125125

126126
- name: upload-unpacked-x64
127127
if: matrix.os-version == 'x64'
128-
uses: actions/upload-artifact@v3
128+
uses: actions/upload-artifact@v4
129129
with:
130130
path: dist/mac/*.7z
131131

132132
- name: upload-unpacked-arm64
133133
if: matrix.os-version == 'arm64'
134-
uses: actions/upload-artifact@v3
134+
uses: actions/upload-artifact@v4
135135
with:
136136
path: dist/mac-arm64/*.7z
137137

@@ -140,19 +140,19 @@ jobs:
140140
matrix:
141141
os-version: ['x64']
142142

143-
runs-on: ubuntu-20.04
143+
runs-on: ubuntu-latest
144144
steps:
145-
- uses: actions/checkout@v3
145+
- uses: actions/checkout@v4
146146
with:
147147
submodules: recursive
148148

149-
- uses: actions/setup-node@v3
149+
- uses: actions/setup-node@v4
150150
with:
151-
node-version: 20
151+
node-version: 22
152152

153-
- uses: pnpm/action-setup@v2
153+
- uses: pnpm/action-setup@v4
154154
with:
155-
version: 8
155+
version: 10
156156

157157
- name: build
158158
run: |
@@ -175,22 +175,22 @@ jobs:
175175
mv *.deb Final2x-linux-pip-${{ matrix.os-version }}-deb.deb
176176
177177
- name: upload-snap
178-
uses: actions/upload-artifact@v3
178+
uses: actions/upload-artifact@v4
179179
with:
180180
path: dist/*.snap
181181

182182
- name: upload-AppImage
183-
uses: actions/upload-artifact@v3
183+
uses: actions/upload-artifact@v4
184184
with:
185185
path: dist/*.AppImage
186186

187187
- name: upload-deb
188-
uses: actions/upload-artifact@v3
188+
uses: actions/upload-artifact@v4
189189
with:
190190
path: dist/*.deb
191191

192192
- name: upload-unpacked
193-
uses: actions/upload-artifact@v3
193+
uses: actions/upload-artifact@v4
194194
with:
195195
path: dist/linux-unpacked/*.7z
196196

‎.npmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
shamefully-hoist=true

‎build/notarize.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const { notarize } = require('@electron/notarize')
2-
31
module.exports = async (context) => {
2+
const { notarize } = require('@electron/notarize')
3+
44
if (process.platform !== 'darwin') return
55

66
console.log('aftersign hook triggered, start to notarize app.')
@@ -15,7 +15,7 @@ module.exports = async (context) => {
1515
return
1616
}
1717

18-
const appId = 'com.electron.app'
18+
const appId = 'com.final2x.app'
1919

2020
const { appOutDir } = context
2121

‎electron-builder.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
appId: com.electron.app
1+
appId: com.final2x.app
22
productName: Final2x
33
directories:
44
buildResources: build
@@ -9,8 +9,16 @@ files:
99
- '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
1010
- '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
1111
- '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
12+
- '!resources/Final2x-core/**'
1213

13-
asar: false
14+
asarUnpack:
15+
- resources/*.png
16+
- resources/*.svg
17+
- resources/*.ico
18+
19+
extraResources:
20+
- from: resources/Final2x-core
21+
to: Final2x-core
1422

1523
afterSign: build/notarize.js
1624

@@ -45,8 +53,10 @@ linux:
4553
- AppImage
4654
- snap
4755
- deb
48-
maintainer: electronjs.org
56+
maintainer: Tohrusky
4957
category: Utility
58+
5059
appImage:
5160
artifactName: ${name}-${version}.${ext}
61+
5262
npmRebuild: false

0 commit comments

Comments
 (0)