Skip to content

Commit 06f5600

Browse files
committed
fix win build
1 parent c7a68d1 commit 06f5600

File tree

2 files changed

+39
-17
lines changed

2 files changed

+39
-17
lines changed

.github/workflows/release.yaml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -226,20 +226,31 @@ jobs:
226226
227227
- name : Deploy project
228228
run: |
229-
mkdir -p deploy
230-
cd src/build/Release
231-
cp OpenConverter.exe ../../../../deploy/
232-
D:\a\_temp\Qt\6.4.3\msvc2019_64\bin\windeployqt.exe .\OpenConverter.exe
233-
cp D:\a\OpenConverter\OpenConverter\ffmpeg\ffmpeg-n4.4.4-94-g5d07afd482-win64-gpl-shared-4.4\bin\*.dll ../../../../deploy/
234-
cd ${{ github.workspace }}
235-
powershell Compress-Archive -Path deploy -DestinationPath deploy/OpenConverter_win64.zip
229+
# 1) Create the deploy folder under the repo workspace
230+
New-Item -ItemType Directory -Force -Path OpenConverter_win64
231+
232+
# 2) Copy your built exe into OpenConverter_win64/
233+
Copy-Item -Path "src\build\Release\OpenConverter.exe" -Destination "OpenConverter_win64"
234+
235+
# 3) Bundle Qt runtime into OpenConverter_win64/
236+
& "D:\a\_temp\Qt\6.4.3\msvc2019_64\bin\windeployqt.exe" `
237+
"--qmldir=src" `
238+
"OpenConverter_win64\OpenConverter.exe"
239+
240+
# 4) Copy FFmpeg DLLs into OpenConverter_win64/
241+
Copy-Item `
242+
-Path "ffmpeg\ffmpeg-n4.4.4-94-g5d07afd482-win64-gpl-shared-4.4\bin\*.dll" `
243+
-Destination "OpenConverter_win64"
244+
245+
# 5) Zip the OpenConverter_win64 folder into the workspace root
246+
Compress-Archive -Path "OpenConverter_win64" -DestinationPath "OpenConverter_win64.zip"
236247
237248
# (Optional) Archive the build artifacts.
238249
- name: Upload build artifacts
239250
uses: actions/upload-artifact@v4
240251
with:
241252
name: OpenConverter_win64
242-
path: deploy\OpenConverter_win64.zip
253+
path: OpenConverter_win64.zip
243254

244255
- name: Get GitHub Release information
245256
id: release_info
@@ -249,7 +260,7 @@ jobs:
249260
uses: softprops/action-gh-release@v1
250261
if: startsWith(github.ref, 'refs/tags/')
251262
with:
252-
files: deploy\OpenConverter_win64.zip
263+
files: OpenConverter_win64.zip
253264

254265
- name: Finish
255266
run: echo "win64 Release upload complete"

.github/workflows/review.yaml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -352,20 +352,31 @@ jobs:
352352
353353
- name : Deploy project
354354
run: |
355-
mkdir D:\deploy\OpenConverter
356-
cd D:\deploy\OpenConverter
357-
cp D:\a\OpenConverter\OpenConverter\src\build\Release\OpenConverter.exe .
358-
D:\a\_temp\Qt\6.4.3\msvc2019_64\bin\windeployqt.exe .\OpenConverter.exe
359-
cp D:\a\OpenConverter\OpenConverter\ffmpeg\ffmpeg-n4.4.4-94-g5d07afd482-win64-gpl-shared-4.4\bin\*.dll .\
360-
cd D:\deploy
361-
powershell Compress-Archive -Path OpenConverter -DestinationPath OpenConverter_win64.zip
355+
# 1) Create the deploy folder under the repo workspace
356+
New-Item -ItemType Directory -Force -Path OpenConverter_win64
357+
358+
# 2) Copy your built exe into OpenConverter_win64/
359+
Copy-Item -Path "src\build\Release\OpenConverter.exe" -Destination "OpenConverter_win64"
360+
361+
# 3) Bundle Qt runtime into OpenConverter_win64/
362+
& "D:\a\_temp\Qt\6.4.3\msvc2019_64\bin\windeployqt.exe" `
363+
"--qmldir=src" `
364+
"OpenConverter_win64\OpenConverter.exe"
365+
366+
# 4) Copy FFmpeg DLLs into OpenConverter_win64/
367+
Copy-Item `
368+
-Path "ffmpeg\ffmpeg-n4.4.4-94-g5d07afd482-win64-gpl-shared-4.4\bin\*.dll" `
369+
-Destination "OpenConverter_win64"
370+
371+
# 5) Zip the OpenConverter_win64 folder into the workspace root
372+
Compress-Archive -Path "OpenConverter_win64" -DestinationPath "OpenConverter_win64.zip"
362373
363374
# (Optional) Archive the build artifacts.
364375
- name: Upload build artifacts
365376
uses: actions/upload-artifact@v4
366377
with:
367378
name: OpenConverter_win64
368-
path: D:\deploy\OpenConverter_win64.zip
379+
path: OpenConverter_win64.zip
369380

370381
# - name: Setup tmate session
371382
# if: ${{ failure() }}

0 commit comments

Comments
 (0)