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