mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-03 01:36:17 +01:00
build: Bump Meson dependency to 0.64.0
It will fix dependency ordering issues found in https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2917#note_1559190. As per `docs/meson-version.md`, we can depend on Meson ≤0.64.0 now as it’s in Debian Testing. The FreeBSD runners have to be changed to explicitly install the right version of Meson using `pip3`, as the system-installed version is not quite new enough. See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3077#note_1596257. Signed-off-by: Philip Withnall <pwithnall@endlessos.org> Helps: !2917
This commit is contained in:
parent
96bc6d6e7c
commit
91f14cd058
@ -11,10 +11,10 @@ cache:
|
|||||||
- _ccache/
|
- _ccache/
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v19"
|
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v20"
|
||||||
COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
|
COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v8"
|
||||||
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v14"
|
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v15"
|
||||||
MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v9"
|
MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v10"
|
||||||
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"
|
||||||
@ -441,6 +441,9 @@ freebsd-12-x86_64:
|
|||||||
LANG: C.UTF-8
|
LANG: C.UTF-8
|
||||||
before_script:
|
before_script:
|
||||||
- bash .gitlab-ci/show-execution-environment.sh
|
- bash .gitlab-ci/show-execution-environment.sh
|
||||||
|
- python3 -m ensurepip --user
|
||||||
|
- /var/tmp/gitlab_runner/.local/bin/pip3 install --user meson==0.64.0
|
||||||
|
- export PATH=/var/tmp/gitlab_runner/.local/bin:$PATH
|
||||||
script:
|
script:
|
||||||
# We cannot use -Wl,--no-undefined because GLib uses 'environ' variable.
|
# We cannot use -Wl,--no-undefined because GLib uses 'environ' variable.
|
||||||
# FreeBSD supports xattr, but its API is different from Linux xattr.
|
# FreeBSD supports xattr, but its API is different from Linux xattr.
|
||||||
@ -474,6 +477,9 @@ freebsd-13-x86_64:
|
|||||||
LANG: C.UTF-8
|
LANG: C.UTF-8
|
||||||
before_script:
|
before_script:
|
||||||
- bash .gitlab-ci/show-execution-environment.sh
|
- bash .gitlab-ci/show-execution-environment.sh
|
||||||
|
- python3 -m ensurepip --user
|
||||||
|
- /var/tmp/gitlab_runner/.local/bin/pip3 install --user meson==0.64.0
|
||||||
|
- export PATH=/var/tmp/gitlab_runner/.local/bin:$PATH
|
||||||
script:
|
script:
|
||||||
- meson ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Dxattr=false _build
|
- meson ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Dxattr=false _build
|
||||||
- ninja -C _build
|
- ninja -C _build
|
||||||
@ -505,7 +511,7 @@ macos:
|
|||||||
CFLAGS: '-Wno-overlength-strings'
|
CFLAGS: '-Wno-overlength-strings'
|
||||||
before_script:
|
before_script:
|
||||||
- bash .gitlab-ci/show-execution-environment.sh
|
- bash .gitlab-ci/show-execution-environment.sh
|
||||||
- pip3 install --user meson==0.60.1
|
- pip3 install --user meson==0.64.0
|
||||||
- pip3 install --user ninja
|
- pip3 install --user ninja
|
||||||
- export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
|
- export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
|
||||||
script:
|
script:
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM registry.gitlab.gnome.org/gnome/glib/fedora:v18
|
FROM registry.gitlab.gnome.org/gnome/glib/fedora:v20
|
||||||
|
|
||||||
ARG COVERITY_SCAN_PROJECT_NAME
|
ARG COVERITY_SCAN_PROJECT_NAME
|
||||||
ARG COVERITY_SCAN_TOKEN
|
ARG COVERITY_SCAN_TOKEN
|
||||||
|
@ -66,7 +66,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 meson==0.60.3
|
RUN pip3 install meson==0.64.0
|
||||||
|
|
||||||
# FIXME: Once we use Debian Bookworm, we can just install the `reuse` package
|
# FIXME: Once we use Debian Bookworm, we can just install the `reuse` package
|
||||||
RUN pip3 install reuse==1.0.0
|
RUN pip3 install reuse==1.0.0
|
||||||
|
@ -74,7 +74,7 @@ RUN dnf -y update \
|
|||||||
make \
|
make \
|
||||||
&& dnf clean all
|
&& dnf clean all
|
||||||
|
|
||||||
RUN pip3 install meson==0.60.3
|
RUN pip3 install meson==0.64.0
|
||||||
|
|
||||||
COPY install-gitlab-cobertura-tools.sh .
|
COPY install-gitlab-cobertura-tools.sh .
|
||||||
RUN ./install-gitlab-cobertura-tools.sh
|
RUN ./install-gitlab-cobertura-tools.sh
|
||||||
|
@ -57,7 +57,7 @@ RUN dnf -y install \
|
|||||||
WORKDIR /opt
|
WORKDIR /opt
|
||||||
COPY cross_file_mingw64.txt /opt
|
COPY cross_file_mingw64.txt /opt
|
||||||
|
|
||||||
RUN pip3 install meson==0.60.3
|
RUN pip3 install meson==0.64.0
|
||||||
|
|
||||||
ARG HOST_USER_ID=5555
|
ARG HOST_USER_ID=5555
|
||||||
ENV HOST_USER_ID ${HOST_USER_ID}
|
ENV HOST_USER_ID ${HOST_USER_ID}
|
||||||
|
@ -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==0.60.3 || goto :error
|
pip3 install --upgrade --user meson==0.64.0 || goto :error
|
||||||
meson %args% _build || goto :error
|
meson %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
|
||||||
ninja -C _build || goto :error
|
ninja -C _build || goto :error
|
||||||
|
@ -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==0.60.3
|
pip3 install --upgrade --user meson==0.64.0
|
||||||
|
|
||||||
PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH"
|
PATH="$(cygpath "$USERPROFILE")/.local/bin:$HOME/.local/bin:$PATH"
|
||||||
DIR="$(pwd)"
|
DIR="$(pwd)"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
project('glib', 'c',
|
project('glib', 'c',
|
||||||
version : '2.75.1',
|
version : '2.75.1',
|
||||||
# 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 : '>= 0.64.0',
|
||||||
default_options : [
|
default_options : [
|
||||||
'buildtype=debugoptimized',
|
'buildtype=debugoptimized',
|
||||||
'warning_level=3',
|
'warning_level=3',
|
||||||
|
Loading…
Reference in New Issue
Block a user