From 4efb3354626c4ea218675fe97e3172af65626812 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Tue, 21 Feb 2023 18:35:33 +0200 Subject: [PATCH] gitlab-ci.yml: Bump meson to 1.0.0 It turns out we no longer have stdout/stderr in CI for the tests. As 1.0.0 is the latest stable version for meson use that to bring back our test messages. Signed-off-by: Marius Vlad --- .gitlab-ci.yml | 2 +- .gitlab-ci/build-deps.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 772b19117..b08f195e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ variables: FDO_UPSTREAM_REPO: wayland/weston FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH" - FDO_DISTRIBUTION_TAG: '2023-02-01.00-wayland-protocols-1.30' + FDO_DISTRIBUTION_TAG: '2023-02-21-bump-meson-to-1.0.0' include: diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh index a07bf4f1b..a4a0e0417 100755 --- a/.gitlab-ci/build-deps.sh +++ b/.gitlab-ci/build-deps.sh @@ -13,7 +13,7 @@ export NINJAFLAGS="-j${FDO_CI_CONCURRENT:-4}" # Build and install Meson. Generally we want to keep this in sync with what # we require inside meson.build. -pip3 install --user git+https://github.com/mesonbuild/meson.git@0.63.0 +pip3 install --user git+https://github.com/mesonbuild/meson.git@1.0.0 export PATH=$HOME/.local/bin:$PATH # Our docs are built using Sphinx (top-level organisation and final HTML/CSS