diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1e702e13a..34c123d2e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -255,7 +255,6 @@ jobs: libjpeg-turbo:p libplacebo:p lua51:p - meson:p ninja:p pkgconf:p python3.11:p @@ -280,6 +279,7 @@ jobs: - name: Run meson tests id: tests run: | + source ./venv/bin/activate meson test -C build - name: Print meson test log diff --git a/ci/build-msys2.sh b/ci/build-msys2.sh index be3fc96dcf..5f83370077 100755 --- a/ci/build-msys2.sh +++ b/ci/build-msys2.sh @@ -1,8 +1,10 @@ #!/bin/sh -e if [ "$1" = "meson" ]; then + python3.11 -m venv venv + source ./venv/bin/activate + python -m pip install meson meson setup build \ - --native-file=ci/msys2-meson.txt \ -D cdda=enabled \ -D d3d-hwaccel=enabled \ -D d3d11=enabled \ diff --git a/ci/msys2-meson.txt b/ci/msys2-meson.txt deleted file mode 100644 index 123131165e..0000000000 --- a/ci/msys2-meson.txt +++ /dev/null @@ -1,2 +0,0 @@ -[binaries] -python3 = 'python3.11'