From e4e3a8fc0bfca61dd5600bd1df13f59356a1a4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Sun, 29 Jan 2023 07:31:44 +0100 Subject: [PATCH] ci: pack mingw64 meson build instead of waf --- .github/workflows/build.yml | 4 ++-- ci/build-mingw64.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3aa61bd753..35ac51f1cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: - name: Build with meson run: | - ./ci/build-mingw64.sh meson + ./ci/build-mingw64.sh meson pack env: TARGET: ${{ matrix.target }} @@ -49,7 +49,7 @@ jobs: - name: Build with waf run: | - ./ci/build-mingw64.sh waf pack + ./ci/build-mingw64.sh waf env: TARGET: ${{ matrix.target }} diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh index d97e6ace4a..6ac2f262ed 100755 --- a/ci/build-mingw64.sh +++ b/ci/build-mingw64.sh @@ -217,7 +217,7 @@ fi if [ "$2" = pack ]; then mkdir -p artifact 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 shopt -s nullglob for file in /usr/lib/gcc/$TARGET/*-posix/*.dll /usr/$TARGET/lib/*.dll; do