ci/msys2: double down on running meson through python3.11

Run not only scripts inside build system, but also meson itself with Python 3.11. Fixes: eb4da34
kasper93 · Jun 29, 2023 · 6fecab8 · 6fecab8
1 parent a61b784
commit 6fecab8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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 ./build/venv/bin/activate
           meson test -C build
 
       - name: Print meson test log

diff --git 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