From 83ffb5d5694fab97b9efe2ea3e89f19997eaa7b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Sun, 25 Jun 2023 18:26:06 +0200 Subject: [PATCH] ci/msys2: switch to Python 3.11 to fix crashes during build There is a longstanding bug with random crashes of Python 3.10 on CI. See: https://github.com/python/cpython/issues/105400 https://github.com/msys2/MINGW-packages/issues/11864 https://github.com/msys2/MINGW-packages/issues/17415 --- .github/workflows/build.yml | 2 +- ci/build-msys2.sh | 1 + ci/msys2-meson.txt | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 ci/msys2-meson.txt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c84d573c8526b..16cefffa605ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -271,7 +271,7 @@ jobs: meson:p ninja:p pkgconf:p - python:p + python3.11:p rst2pdf:p rubberband:p shaderc:p diff --git a/ci/build-msys2.sh b/ci/build-msys2.sh index 6073836779c7e..be3fc96dcf423 100755 --- a/ci/build-msys2.sh +++ b/ci/build-msys2.sh @@ -2,6 +2,7 @@ if [ "$1" = "meson" ]; then 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 new file mode 100644 index 0000000000000..123131165e1e8 --- /dev/null +++ b/ci/msys2-meson.txt @@ -0,0 +1,2 @@ +[binaries] +python3 = 'python3.11'