Skip to content

Commit 9c9b28e

Browse files
committed
CI Win make bundle: reindent
shorter lines + respect shell formatting + dot before "exe" (glob) + leading 2 spaces instead of 4 to be consistent with the rest
1 parent 4f5b4df commit 9c9b28e

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

.github/workflows/ccpp.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -347,16 +347,28 @@ jobs:
347347
run: make check
348348
- name: make bundle
349349
run: |
350-
cp gui/QT/uv-qt.exe bin
351-
rm bin/run_tests.exe
352-
export DESTDIR=build/UltraGrid-$VERSION-win64
353-
make install
354-
for exe in "$DESTDIR"/*exe; do data/scripts/get_dll_depends.sh "$exe" | while read -r n; do cp "$n" "$DESTDIR"; done; done
355-
if command -v windeployqt-qt6 >/dev/null; then windeployqt-qt6 "$DESTDIR/uv-qt.exe"; else windeployqt "$DESTDIR/uv-qt.exe"; fi
356-
cp -r data/Windows/* "$DESTDIR"
357-
data/scripts/get_dll_depends.sh "$DESTDIR/screen-capture-recorder-x64.dll" | while read -r n; do cp "$n" "$DESTDIR"; done
350+
cp gui/QT/uv-qt.exe bin
351+
rm bin/run_tests.exe
352+
export DESTDIR=build/UltraGrid-$VERSION-win64
353+
make install
354+
for exe in "$DESTDIR"/*.exe; do
355+
data/scripts/get_dll_depends.sh "$exe" |
356+
while read -r n; do cp "$n" "$DESTDIR"; done
357+
done
358+
if command -v windeployqt-qt6 >/dev/null; then
359+
windeployqt-qt6 "$DESTDIR/uv-qt.exe"
360+
else
361+
windeployqt "$DESTDIR/uv-qt.exe"
362+
fi
363+
cp -r data/Windows/* "$DESTDIR"
364+
data/scripts/get_dll_depends.sh\
365+
"$DESTDIR/screen-capture-recorder-x64.dll" |
366+
while read -r n; do cp "$n" "$DESTDIR"; done
358367
- name: make dist-check
359-
run: PATH= /usr/bin/make distcheck TARGET=build/UltraGrid-$VERSION-win64/uv.exe REFLECTOR_TARGET=build/UltraGrid-$VERSION-win64/hd-rum-transcode.exe GUI_EXE=build/UltraGrid-$VERSION-win64/uv-qt.exe
368+
run: PATH= /usr/bin/make distcheck
369+
TARGET=build/UltraGrid-$VERSION-win64/uv.exe
370+
REFLECTOR_TARGET=build/UltraGrid-$VERSION-win64/hd-rum-transcode.exe
371+
GUI_EXE=build/UltraGrid-$VERSION-win64/uv-qt.exe
360372
- name: Upload Release Asset
361373
id: upload-release
362374
if: (github.repository == 'CESNET/UltraGrid' && github.ref == 'refs/heads/master') || startsWith(github.ref, 'refs/tags/')

0 commit comments

Comments
 (0)