ci: pack mingw64 meson build instead of waf

This commit is contained in:
Kacper Michajłow 2023-01-29 07:31:44 +01:00 committed by Dudemanguy
parent 7151b5122a
commit e4e3a8fc0b
2 changed files with 3 additions and 3 deletions

View File

@ -38,7 +38,7 @@ jobs:
- name: Build with meson - name: Build with meson
run: | run: |
./ci/build-mingw64.sh meson ./ci/build-mingw64.sh meson pack
env: env:
TARGET: ${{ matrix.target }} TARGET: ${{ matrix.target }}
@ -49,7 +49,7 @@ jobs:
- name: Build with waf - name: Build with waf
run: | run: |
./ci/build-mingw64.sh waf pack ./ci/build-mingw64.sh waf
env: env:
TARGET: ${{ matrix.target }} TARGET: ${{ matrix.target }}

View File

@ -217,7 +217,7 @@ fi
if [ "$2" = pack ]; then if [ "$2" = pack ]; then
mkdir -p artifact mkdir -p artifact
echo "Copying:" echo "Copying:"
cp -pv build_waf/mpv.{com,exe} "$prefix_dir/bin/"*.dll artifact/ cp -pv build/generated/mpv.com build/mpv.exe "$prefix_dir/bin/"*.dll artifact/
# ship everything and the kitchen sink # ship everything and the kitchen sink
shopt -s nullglob shopt -s nullglob
for file in /usr/lib/gcc/$TARGET/*-posix/*.dll /usr/$TARGET/lib/*.dll; do for file in /usr/lib/gcc/$TARGET/*-posix/*.dll /usr/$TARGET/lib/*.dll; do