diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6aaad073..dfd61b24 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: '2022-10-14.00-aml-0.3.0-neatvnc-0.6.0' + FDO_DISTRIBUTION_TAG: '2023-01-25.00-meson-0.63.0' include: diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh index ff996d2b..5ee0059c 100755 --- a/.gitlab-ci/build-deps.sh +++ b/.gitlab-ci/build-deps.sh @@ -12,10 +12,8 @@ export MAKEFLAGS="-j${FDO_CI_CONCURRENT:-4}" 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, however we require at least 0.57.0 per -# wayland/weston@bcf37c937a36, and 0.57.1 to fix the TAP parser when a test -# exits unsuccessfully -pip3 install --user git+https://github.com/mesonbuild/meson.git@0.57.1 +# we require inside meson.build. +pip3 install --user git+https://github.com/mesonbuild/meson.git@0.63.0 export PATH=$HOME/.local/bin:$PATH # Our docs are built using Sphinx (top-level organisation and final HTML/CSS