Skip to content

Commit c669cad

Browse files
cute-omegacute-omega
committed
呸，是暂存用反了（这次统一所有架构名称，不能再出错了吧）
1 parent 4539e35 commit c669cad

File tree

2 files changed

+101
-47
lines changed

2 files changed

+101
-47
lines changed

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

Lines changed: 46 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
if: ${{ matrix.os == 'windows' }}
137137
run: |
138138
cd packages/gui/dist_electron;
139-
ren DevSidecar-${{ steps.package-info.outputs.version }}-x64.exe DevSidecar-${{ steps.package-info.outputs.version }}-windows-x64.exe;
139+
ren DevSidecar-${{ steps.package-info.outputs.version }}-x64.exe DevSidecar-${{ steps.package-info.outputs.version }}-windows-x86_64.exe;
140140
ren DevSidecar-${{ steps.package-info.outputs.version }}-ia32.exe DevSidecar-${{ steps.package-info.outputs.version }}-windows-ia32.exe;
141141
ren DevSidecar-${{ steps.package-info.outputs.version }}-arm64.exe DevSidecar-${{ steps.package-info.outputs.version }}-windows-arm64.exe;
142142
ren DevSidecar-${{ steps.package-info.outputs.version }}.exe DevSidecar-${{ steps.package-info.outputs.version }}-windows-universal.exe;
@@ -145,37 +145,52 @@ jobs:
145145
if: ${{ matrix.os == 'ubuntu' }}
146146
run: |
147147
cd packages/gui/dist_electron;
148-
mv DevSidecar-${{ steps.package-info.outputs.version }}-amd64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb;
148+
mv DevSidecar-${{ steps.package-info.outputs.version }}-amd64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.deb;
149+
149150
mv DevSidecar-${{ steps.package-info.outputs.version }}-x86_64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage;
150-
mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz;
151-
mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.rpm;
151+
152+
mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.tar.gz;
153+
154+
mv DevSidecar-${{ steps.package-info.outputs.version }}-x86_64.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.rpm;
155+
152156
#-------------------------------------------------------------------------------------------------------------------------
153157
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb;
158+
154159
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage;
160+
155161
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz;
156-
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm;
162+
163+
mv DevSidecar-${{ steps.package-info.outputs.version }}-aarch64.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.rpm;
164+
157165
#-------------------------------------------------------------------------------------------------------------------------
158166
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb;
167+
159168
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage;
169+
160170
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz;
171+
161172
mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.rpm DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm;
173+
162174
ls -lah;
163175
- name: Rename artifacts - macOS
164176
if: ${{ matrix.os == 'macos' }}
165177
run: |
166178
cd packages/gui/dist_electron;
167-
mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.dmg DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg;
179+
mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.dmg DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg;
180+
168181
mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.dmg DevSidecar-${{ steps.package-info.outputs.version }}-macos-arm64.dmg;
182+
169183
mv DevSidecar-${{ steps.package-info.outputs.version }}-universal.dmg DevSidecar-${{ steps.package-info.outputs.version }}-macos-universal.dmg;
184+
170185
ls -lah;
171186
172187
# region Upload artifacts - Windows
173-
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-windows-x64.exe"
188+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-windows-x86_64.exe"
174189
uses: actions/upload-artifact@v4.4.0
175190
if: ${{ matrix.os == 'windows' }}
176191
with:
177-
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-windows-x64.exe
178-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-windows-x64.exe"
192+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-windows-x86_64.exe
193+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-windows-x86_64.exe"
179194
if-no-files-found: error
180195
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-windows-ia32.exe"
181196
uses: actions/upload-artifact@v4.4.0
@@ -201,12 +216,12 @@ jobs:
201216
# endregion Upload artifacts - Windows
202217

203218
# region Upload artifacts - Linux
204-
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb"
219+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.deb"
205220
uses: actions/upload-artifact@v4.4.0
206221
if: ${{ matrix.os == 'ubuntu' }}
207222
with:
208-
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb
209-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb"
223+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.deb
224+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.deb"
210225
if-no-files-found: error
211226
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage"
212227
uses: actions/upload-artifact@v4.4.0
@@ -215,19 +230,19 @@ jobs:
215230
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage
216231
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage"
217232
if-no-files-found: error
218-
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz"
233+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.tar.gz"
219234
uses: actions/upload-artifact@v4.4.0
220235
if: ${{ matrix.os == 'ubuntu' }}
221236
with:
222-
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz
223-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz"
237+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.tar.gz
238+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.tar.gz"
224239
if-no-files-found: error
225-
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.rpm"
240+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.rpm"
226241
uses: actions/upload-artifact@v4.4.0
227242
if: ${{ matrix.os == 'ubuntu' }}
228243
with:
229-
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.rpm
230-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.rpm"
244+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.rpm
245+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.rpm"
231246
if-no-files-found: error
232247
# -------------------------------------------------------------------------------------------------------------------------
233248
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb"
@@ -290,12 +305,12 @@ jobs:
290305
# endregion Upload artifacts - Linux
291306

292307
# Upload artifacts - macOS
293-
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg"
308+
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg"
294309
uses: actions/upload-artifact@v4.4.0
295310
if: ${{ matrix.os == 'macos' }}
296311
with:
297-
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg
298-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg"
312+
path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg
313+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg"
299314
if-no-files-found: error
300315
- name: "Upload DevSidecar-${{ steps.package-info.outputs.version }}-macos-arm64.dmg"
301316
uses: actions/upload-artifact@v4.4.0
@@ -331,10 +346,10 @@ jobs:
331346
run: mkdir release
332347

333348
# Download artifacts
334-
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-windows-x64.exe"
349+
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-windows-x86_64.exe"
335350
uses: actions/download-artifact@v4.1.8
336351
with:
337-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-windows-x64.exe"
352+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-windows-x86_64.exe"
338353
path: release
339354
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-windows-ia32.exe"
340355
uses: actions/download-artifact@v4.1.8
@@ -352,25 +367,25 @@ jobs:
352367
name: "DevSidecar-${{ steps.package-info.outputs.version }}-windows-universal.exe"
353368
path: release
354369

355-
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb"
370+
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.deb"
356371
uses: actions/download-artifact@v4.1.8
357372
with:
358-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb"
373+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.deb"
359374
path: release
360375
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage"
361376
uses: actions/download-artifact@v4.1.8
362377
with:
363378
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage"
364379
path: release
365-
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz"
380+
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.tar.gz"
366381
uses: actions/download-artifact@v4.1.8
367382
with:
368-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz"
383+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.tar.gz"
369384
path: release
370-
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.rpm"
385+
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.rpm"
371386
uses: actions/download-artifact@v4.1.8
372387
with:
373-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.rpm"
388+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.rpm"
374389
path: release
375390
# -------------------------------------------------------------------------------------------------------------------------
376391
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb"
@@ -415,10 +430,10 @@ jobs:
415430
name: "DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.rpm"
416431
path: release
417432

418-
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg"
433+
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg"
419434
uses: actions/download-artifact@v4.1.8
420435
with:
421-
name: "DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg"
436+
name: "DevSidecar-${{ steps.package-info.outputs.version }}-macos-x86_64.dmg"
422437
path: release
423438
- name: "Download DevSidecar-${{ steps.package-info.outputs.version }}-macos-arm64.dmg"
424439
uses: actions/download-artifact@v4.1.8

0 commit comments

Comments
 (0)