diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b319349d4..182b9c7a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -325,6 +325,10 @@ msys2-mingw32: CHERE_INVOKING: "yes" CFLAGS: -coverage -ftest-coverage -fprofile-arcs PYTHONUTF8: "1" + # FIXME: For some reason enabling jit debugging "fixes" random python crashes + # see https://github.com/msys2/MINGW-packages/issues/11864 and + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3280#note_1678973 + MSYS: "winjitdebug" script: - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20 - C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh @@ -351,6 +355,10 @@ msys2-clang64: MSYSTEM: "CLANG64" CHERE_INVOKING: "yes" PYTHONUTF8: "1" + # FIXME: For some reason enabling jit debugging "fixes" random python crashes + # see https://github.com/msys2/MINGW-packages/issues/11864 and + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3280#note_1678973 + MSYS: "winjitdebug" script: - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20 - C:\msys64\usr\bin\bash .gitlab-ci/show-execution-environment.sh @@ -511,7 +519,7 @@ macos: CFLAGS: '-Wno-overlength-strings' before_script: - bash .gitlab-ci/show-execution-environment.sh - - pip3 install --user meson==0.60.1 + - pip3 install --user meson==1.0.0 - pip3 install --user ninja - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH script: diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index 60a62ff76..a1b4dbbf3 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -12,7 +12,7 @@ for %%x in (%*) do ( set args=%args:~1% :: FIXME: make warnings fatal -pip3 install --upgrade --user meson==0.60.3 || goto :error +pip3 install --upgrade --user meson==1.0.0 || goto :error meson %args% _build || goto :error python .gitlab-ci/check-missing-install-tag.py _build || goto :error ninja -C _build || goto :error diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index d253007dd..b4b83e985 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -26,7 +26,7 @@ CCACHE_BASEDIR="$(pwd)" CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" export CCACHE_BASEDIR CCACHE_DIR -pip3 install --upgrade --user meson==0.60.3 +pip3 install --upgrade --user meson==1.0.0 PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH" DIR="$(pwd)"