From 24a3e728ce444559374e6cf3fb4f74968fba29cc Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 24 Oct 2023 16:46:36 +0100 Subject: [PATCH] build: Bump Meson dependency to 1.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And update all the CI builds to use the latest micro release from that series, 1.2.3. This version bump means we can: - Drop some backwards-compatibility Meson checks - Fix a periodic CI failure caused by a now-fixed Meson bug (https://github.com/mesonbuild/meson/pull/10633) It’s in line with our [Meson version policy](./docs/meson-version.md), as Meson 1.2.1 is available in [Debian Trixie](https://packages.debian.org/source/trixie/meson) and the [freedesktop SDK](https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/blob/c95902f2ed5cb7d9b8e352135facc539029ef6c9/elements/components/meson.bst). Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 8 ++++---- .gitlab-ci/debian-stable.Dockerfile | 2 +- .gitlab-ci/fedora.Dockerfile | 2 +- .gitlab-ci/mingw.Dockerfile | 2 +- .gitlab-ci/test-msvc.bat | 2 +- .gitlab-ci/test-msys2.sh | 2 +- meson.build | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d99d51de..d2b627de1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,10 +11,10 @@ cache: - _ccache/ variables: - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v21" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v22" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7" - DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v15" - MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v11" + DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v16" + MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v12" MESON_TEST_TIMEOUT_MULTIPLIER: 4 G_MESSAGES_DEBUG: all MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings" @@ -574,7 +574,7 @@ macos-x86_64: - ln -s /opt/cmake/CMake.app/Contents/bin/cmake .venv/bin - ln -s /opt/ccache/ccache .venv/bin - source .venv/bin/activate - - pip3 install meson==1.2.0 + - pip3 install meson==1.2.3 - pip3 install ninja==1.11.1 script: # FIXME: Use --wrap-mode=default so we download dependencies each time, diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile index e6a2c7188..592a6b356 100644 --- a/.gitlab-ci/debian-stable.Dockerfile +++ b/.gitlab-ci/debian-stable.Dockerfile @@ -68,7 +68,7 @@ RUN locale-gen de_DE.UTF-8 \ ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8 -RUN pip3 install --break-system-packages meson==0.60.3 +RUN pip3 install --break-system-packages meson==1.2.3 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index edadf71a2..5e28542ab 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -75,7 +75,7 @@ RUN dnf -y update \ make \ && dnf clean all -RUN pip3 install meson==0.60.3 +RUN pip3 install meson==1.2.3 COPY install-gitlab-cobertura-tools.sh . RUN ./install-gitlab-cobertura-tools.sh diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile index 6ebd452a7..d801255ce 100644 --- a/.gitlab-ci/mingw.Dockerfile +++ b/.gitlab-ci/mingw.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/glib/fedora:v21 +FROM registry.gitlab.gnome.org/gnome/glib/fedora:v22 USER root diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index aee77d33d..2de8811ca 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==1.0.0 || goto :error +pip3 install --upgrade --user meson==1.2.3 || goto :error meson setup %args% _build || goto :error python .gitlab-ci/check-missing-install-tag.py _build || goto :error meson compile -C _build || goto :error diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 20032c4b4..3735b4c03 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==1.0.0 +pip3 install --upgrade --user meson==1.2.3 PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH" DIR="$(pwd)" diff --git a/meson.build b/meson.build index d788cdfe1..6cab237d2 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('glib', 'c', version : '2.79.0', # NOTE: See the policy in docs/meson-version.md before changing the Meson dependency - meson_version : '>= 0.60.0', + meson_version : '>= 1.2.0', default_options : [ 'buildtype=debugoptimized', 'warning_level=3',