luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 06:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: Bump Meson dependency to 1.2.0

Browse Source 
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](c95902f2ed/elements/components/meson.bst).

Signed-off-by: Philip Withnall <philip@tecnocode.co.uk>
This commit is contained in:
Philip Withnall 2023-10-24 16:46:36 +01:00
parent 70c66766f7
commit 24a3e728ce
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -11,10 +11,10 @@ cache:
- _ccache/ - _ccache/
variables: 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" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v15" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v16"
MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v11" MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v12"
MESON_TEST_TIMEOUT_MULTIPLIER: 4 MESON_TEST_TIMEOUT_MULTIPLIER: 4
G_MESSAGES_DEBUG: all G_MESSAGES_DEBUG: all
MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --fatal-meson-warnings" 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/cmake/CMake.app/Contents/bin/cmake .venv/bin
- ln -s /opt/ccache/ccache .venv/bin - ln -s /opt/ccache/ccache .venv/bin
- source .venv/bin/activate - source .venv/bin/activate
- pip3 install meson==1.2.0 - pip3 install meson==1.2.3
- pip3 install ninja==1.11.1 - pip3 install ninja==1.11.1
script: script:
# FIXME: Use --wrap-mode=default so we download dependencies each time, # FIXME: Use --wrap-mode=default so we download dependencies each time,

2
.gitlab-ci/debian-stable.Dockerfile
View File

@ -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 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 ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID} ENV HOST_USER_ID ${HOST_USER_ID}

2
.gitlab-ci/fedora.Dockerfile
View File

@ -75,7 +75,7 @@ RUN dnf -y update \
make \ make \
&& dnf clean all && dnf clean all
RUN pip3 install meson==0.60.3 RUN pip3 install meson==1.2.3
COPY install-gitlab-cobertura-tools.sh . COPY install-gitlab-cobertura-tools.sh .
RUN ./install-gitlab-cobertura-tools.sh RUN ./install-gitlab-cobertura-tools.sh

2
.gitlab-ci/mingw.Dockerfile
View File

@ -1,4 +1,4 @@
FROM registry.gitlab.gnome.org/gnome/glib/fedora:v21 FROM registry.gitlab.gnome.org/gnome/glib/fedora:v22
USER root USER root

2
.gitlab-ci/test-msvc.bat
View File

@ -12,7 +12,7 @@ for %%x in (%*) do (
set args=%args:~1% set args=%args:~1%
:: FIXME: make warnings fatal :: 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 meson setup %args% _build || goto :error
python .gitlab-ci/check-missing-install-tag.py _build || goto :error python .gitlab-ci/check-missing-install-tag.py _build || goto :error
meson compile -C _build || goto :error meson compile -C _build || goto :error

2
.gitlab-ci/test-msys2.sh
View File

@ -26,7 +26,7 @@ CCACHE_BASEDIR="$(pwd)"
CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
export CCACHE_BASEDIR CCACHE_DIR 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" PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH"
DIR="$(pwd)" DIR="$(pwd)"

2
meson.build
View File

@ -1,7 +1,7 @@
project('glib', 'c', project('glib', 'c',
version : '2.79.0', version : '2.79.0',
# NOTE: See the policy in docs/meson-version.md before changing the Meson dependency # 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 : [ default_options : [
'buildtype=debugoptimized', 'buildtype=debugoptimized',
'warning_level=3', 'warning_level=3',