From 93df6447faf8e730d7d05351fafbe4e8e45e9552 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 14 Dec 2022 12:42:58 -0500 Subject: [PATCH] Install meson 0.64 in ci jobs --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a745940d8c..2b661f6286 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,6 +82,7 @@ fedora-x86_64: EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both" script: - .gitlab-ci/show-info-linux.sh + - pip3 install --user meson~=0.64 - meson subprojects update --reset - mkdir _install - meson --prefix=${CI_PROJECT_DIR}/_install @@ -104,6 +105,7 @@ release-build: EXTRA_MESON_FLAGS: "--buildtype=release" script: - .gitlab-ci/show-info-linux.sh + - pip3 install --user meson~=0.64 - meson subprojects update - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build @@ -128,6 +130,7 @@ fedora-mingw64: # mingw64-graphene (rawhide) script: - .gitlab-ci/show-info-linux.sh + - pip3 install --user meson~=0.64 - meson subprojects update - mkdir _build && cd _build - mingw64-meson -Dintrospection=disabled -Dgraphene:introspection=disabled @@ -142,6 +145,7 @@ installed-tests: G_TEST_ACCESSIBLE: 1 script: - .gitlab-ci/show-info-linux.sh + - pip3 install --user meson~=0.64 - meson subprojects update - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS} _build @@ -197,7 +201,7 @@ macos: needs: [] before_script: - bash .gitlab-ci/show-info-osx.sh - - pip3 install --user meson==0.60.3 + - pip3 install --user meson~=0.64 - pip3 install --user ninja - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH - export MESON_FORCE_BACKTRACE=1 -- 2.30.2