Skip to content

Commit d6751c1

Browse files
cute-omegacute-omega
committed
feat: 反向移植了GitHub Actions脚本内容以处理架构名和新增安装包类型支持
1 parent d7aef47 commit d6751c1

3 files changed

Lines changed: 177 additions & 82 deletions

File tree

‎.github/workflows/build-and-release.yml‎

Lines changed: 101 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ on:
44
push:
55
branches:
66
- release*
7+
paths-ignore:
8+
- "_script/**"
9+
- "doc/**"
10+
- "**/*.md"
11+
- "**/.gitignore"
12+
- "**/LICENSE"
713

814
jobs:
915
# job 1
@@ -24,6 +30,9 @@ jobs:
2430
steps:
2531
- name: Checkout
2632
uses: actions/checkout@v4.1.7
33+
with:
34+
submodules: true
35+
fetch-depth: 0
2736

2837
- name: Setup pnpm
2938
uses: pnpm/action-setup@v4
@@ -44,7 +53,7 @@ jobs:
4453
id: package-info
4554
uses: luizfelipelaviola/get-package-info@v1
4655
with:
47-
path: ./packages/mitmproxy
56+
path: ./packages/gui
4857

4958
- name: Print
5059
run: |
@@ -96,12 +105,12 @@ jobs:
96105
echo "--------------------";
97106
pnpm install;
98107
99-
- name: "test packages/core"
108+
- name: test packages/core
100109
run: |
101110
cd packages/core;
102111
pnpm run test;
103112
104-
- name: "test packages/mitmproxy"
113+
- name: test packages/mitmproxy
105114
run: |
106115
cd packages/mitmproxy;
107116
pnpm run test;
@@ -128,47 +137,65 @@ jobs:
128137
dir || ls -lah;
129138
130139
# Rename artifacts
131-
- name: "Rename artifacts - Windows"
140+
- name: Rename artifacts - Windows
132141
if: ${{ matrix.os == 'windows' }}
133142
run: |
134143
cd packages/gui/dist_electron;
135-
ren DevSidecar-${{ steps.package-info.outputs.version }}-x64.exe DevSidecar-${{ steps.package-info.outputs.version }}-windows-x64.exe;
144+
ren DevSidecar-${{ steps.package-info.outputs.version }}-x64.exe DevSidecar-${{ steps.package-info.outputs.version }}-windows-x86_64.exe;
136145
ren DevSidecar-${{ steps.package-info.outputs.version }}-ia32.exe DevSidecar-${{ steps.package-info.outputs.version }}-windows-ia32.exe;
137146
ren DevSidecar-${{ steps.package-info.outputs.version }}-arm64.exe DevSidecar-${{ steps.package-info.outputs.version }}-windows-arm64.exe;
138147
ren DevSidecar-${{ steps.package-info.outputs.version }}.exe DevSidecar-${{ steps.package-info.outputs.version }}-windows-universal.exe;
139148
dir;
140-
- name: "Rename artifacts - Linux"
149+
- name: Rename artifacts - Linux
141150
if: ${{ matrix.os == 'ubuntu' }}
142151
run: |
143152
cd packages/gui/dist_electron;
144-
mv DevSidecar-${{ steps.package-info.outputs.version }}-amd64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb;
153+
mv DevSidecar-${{ steps.package-info.outputs.version }}-amd64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.deb;
154+
145155
mv DevSidecar-${{ steps.package-info.outputs.version }}-x86_64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage;
146-
mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz;
156+
157+
mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.tar.gz;
158+
159+
mv DevSidecar-${{ steps.package-info.outputs.version }}-x86_64.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.rpm;
160+
147161
#-------------------------------------------------------------------------------------------------------------------------
148162
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb;
163+
149164
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage;
165+
150166
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz;
167+
168+
mv DevSidecar-${{ steps.package-info.outputs.version }}-aarch64.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm;
169+
151170
#-------------------------------------------------------------------------------------------------------------------------
152171
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb;
172+
153173
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage;
174+
154175
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz;
176+
177+
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm;
178+
155179
ls -lah;
156-
- name: "Rename artifacts - macOS"
180+
- name: Rename artifacts - macOS
157181
if: ${{ matrix.os == 'macos' }}
158182
run: |
159183
cd packages/gui/dist_electron;
160-
mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.dmg DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg;
184+
mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.dmg DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg;
185+
161186
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.dmg DevSidecar-${{ steps.package-info.outputs.version }}-macos-arm64.dmg;
187+
162188
mv DevSidecar-${{ steps.package-info.outputs.version }}-universal.dmg DevSidecar-${{ steps.package-info.outputs.version }}-macos-universal.dmg;
189+
163190
ls -lah;
164191
165-
#region Upload artifacts - Windows
166-
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-windows-x64.exe"
192+
# region Upload artifacts - Windows
193+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-windows-x86_64.exe"
167194
uses: actions/upload-artifact@v4.4.0
168195
if: ${{ matrix.os == 'windows' }}
169196
with:
170-
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-windows-x64.exe
171-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-windows-x64.exe"
197+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-windows-x86_64.exe
198+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-windows-x86_64.exe"
172199
if-no-files-found: error
173200
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-windows-ia32.exe"
174201
uses: actions/upload-artifact@v4.4.0
@@ -191,15 +218,15 @@ jobs:
191218
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-windows-universal.exe
192219
name: "DevSidecar-${{ steps.package-info.outputs.version }}-windows-universal.exe"
193220
if-no-files-found: error
194-
#endregion Upload artifacts - Windows
221+
# endregion Upload artifacts - Windows
195222

196-
#region Upload artifacts - Linux
197-
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb"
223+
# region Upload artifacts - Linux
224+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.deb"
198225
uses: actions/upload-artifact@v4.4.0
199226
if: ${{ matrix.os == 'ubuntu' }}
200227
with:
201-
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb
202-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb"
228+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.deb
229+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.deb"
203230
if-no-files-found: error
204231
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage"
205232
uses: actions/upload-artifact@v4.4.0
@@ -208,14 +235,21 @@ jobs:
208235
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage
209236
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage"
210237
if-no-files-found: error
211-
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz"
238+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.tar.gz"
239+
uses: actions/upload-artifact@v4.4.0
240+
if: ${{ matrix.os == 'ubuntu' }}
241+
with:
242+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.tar.gz
243+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.tar.gz"
244+
if-no-files-found: error
245+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.rpm"
212246
uses: actions/upload-artifact@v4.4.0
213247
if: ${{ matrix.os == 'ubuntu' }}
214248
with:
215-
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz
216-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz"
249+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.rpm
250+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.rpm"
217251
if-no-files-found: error
218-
#-------------------------------------------------------------------------------------------------------------------------
252+
# -------------------------------------------------------------------------------------------------------------------------
219253
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb"
220254
uses: actions/upload-artifact@v4.4.0
221255
if: ${{ matrix.os == 'ubuntu' }}
@@ -237,7 +271,14 @@ jobs:
237271
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz
238272
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz"
239273
if-no-files-found: error
240-
#-------------------------------------------------------------------------------------------------------------------------
274+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm"
275+
uses: actions/upload-artifact@v4.4.0
276+
if: ${{ matrix.os == 'ubuntu' }}
277+
with:
278+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm
279+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm"
280+
if-no-files-found: error
281+
# -------------------------------------------------------------------------------------------------------------------------
241282
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb"
242283
uses: actions/upload-artifact@v4.4.0
243284
if: ${{ matrix.os == 'ubuntu' }}
@@ -259,15 +300,22 @@ jobs:
259300
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz
260301
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz"
261302
if-no-files-found: error
262-
#endregion Upload artifacts - Linux
303+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm"
304+
uses: actions/upload-artifact@v4.4.0
305+
if: ${{ matrix.os == 'ubuntu' }}
306+
with:
307+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm
308+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm"
309+
if-no-files-found: error
310+
# endregion Upload artifacts - Linux
263311

264312
# Upload artifacts - macOS
265-
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg"
313+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg"
266314
uses: actions/upload-artifact@v4.4.0
267315
if: ${{ matrix.os == 'macos' }}
268316
with:
269-
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg
270-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg"
317+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg
318+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg"
271319
if-no-files-found: error
272320
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-macos-arm64.dmg"
273321
uses: actions/upload-artifact@v4.4.0
@@ -303,10 +351,10 @@ jobs:
303351
run: mkdir release
304352

305353
# Download artifacts
306-
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-windows-x64.exe"
354+
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-windows-x86_64.exe"
307355
uses: actions/download-artifact@v4.1.8
308356
with:
309-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-windows-x64.exe"
357+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-windows-x86_64.exe"
310358
path: release
311359
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-windows-ia32.exe"
312360
uses: actions/download-artifact@v4.1.8
@@ -324,22 +372,27 @@ jobs:
324372
name: "DevSidecar-${{ steps.package-info.outputs.version }}-windows-universal.exe"
325373
path: release
326374

327-
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb"
375+
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.deb"
328376
uses: actions/download-artifact@v4.1.8
329377
with:
330-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb"
378+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.deb"
331379
path: release
332380
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage"
333381
uses: actions/download-artifact@v4.1.8
334382
with:
335383
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage"
336384
path: release
337-
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz"
385+
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.tar.gz"
338386
uses: actions/download-artifact@v4.1.8
339387
with:
340-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz"
388+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.tar.gz"
341389
path: release
342-
#-------------------------------------------------------------------------------------------------------------------------
390+
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.rpm"
391+
uses: actions/download-artifact@v4.1.8
392+
with:
393+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.rpm"
394+
path: release
395+
# -------------------------------------------------------------------------------------------------------------------------
343396
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb"
344397
uses: actions/download-artifact@v4.1.8
345398
with:
@@ -355,7 +408,12 @@ jobs:
355408
with:
356409
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz"
357410
path: release
358-
#-------------------------------------------------------------------------------------------------------------------------
411+
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm"
412+
uses: actions/download-artifact@v4.1.8
413+
with:
414+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm"
415+
path: release
416+
# -------------------------------------------------------------------------------------------------------------------------
359417
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb"
360418
uses: actions/download-artifact@v4.1.8
361419
with:
@@ -371,11 +429,16 @@ jobs:
371429
with:
372430
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz"
373431
path: release
432+
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm"
433+
uses: actions/download-artifact@v4.1.8
434+
with:
435+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm"
436+
path: release
374437

375-
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg"
438+
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg"
376439
uses: actions/download-artifact@v4.1.8
377440
with:
378-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg"
441+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg"
379442
path: release
380443
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-macos-arm64.dmg"
381444
uses: actions/download-artifact@v4.1.8

‎.github/workflows/npm-run-electron.yml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ jobs:
3131
steps:
3232
- name: Checkout
3333
uses: actions/checkout@v4.1.7
34+
with:
35+
submodules: true
36+
fetch-depth: 0
3437

3538
- name: Setup pnpm
3639
uses: pnpm/action-setup@v4
@@ -96,15 +99,9 @@ jobs:
9699
echo "--------------------";
97100
pnpm install;
98101
99-
- name: npm run electron
102+
- name: npm run electron (auto-exit after 30min)
100103
run: |
101104
echo "======================================================================";
102-
echo "cd packages/gui";
103-
echo "--------------------";
104-
cd packages/gui;
105-
dir || ls -lah;
106-
107-
echo "======================================================================";
108-
echo "npm run electron";
105+
echo "electron with timeout";
109106
echo "--------------------";
110-
npm run electron;
107+
node _script/run-electron-with-timeout.js packages/gui 5

0 commit comments

Comments
 (0)