Commit 4b983e51 authored by Xavier Claessens's avatar Xavier Claessens

ci: Upgrade meson to 0.48.0 and use --fatal-meson-warnings

parent 686d60d7
image: registry.gitlab.gnome.org/gnome/glib/master:v7
image: registry.gitlab.gnome.org/gnome/glib/master:v8
stages:
- build
......@@ -12,6 +12,7 @@ cache:
variables:
MESON_TEST_TIMEOUT_MULTIPLIER: 2
G_MESSAGES_DEBUG: all
MESON_COMMON_OPTIONS: "--buildtype debug --fatal-meson-warnings"
fedora-x86_64:
stage: build
......@@ -20,7 +21,7 @@ fedora-x86_64:
variables:
CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
script:
- meson --buildtype debug --werror -Dsystemtap=true -Ddtrace=true -Dfam=true _build .
- meson ${MESON_COMMON_OPTIONS} --werror -Dsystemtap=true -Ddtrace=true -Dfam=true _build
- ninja -C _build
- mkdir -p _coverage
- lcov --rc lcov_branch_coverage=1 --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
......@@ -76,21 +77,21 @@ cross-android_api21_arm64:
<<: *cross-template
script:
# FIXME: add --werror
- meson --cross-file=/opt/cross_file_android_arm64_21.txt -Diconv=gnu -Dinternal_pcre=true --buildtype debug _build
- meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_android_arm64_21.txt -Diconv=gnu -Dinternal_pcre=true _build
- ninja -C _build
cross-android_api28_arm64:
<<: *cross-template
script:
# FIXME: add --werror
- meson --cross-file=/opt/cross_file_android_arm64_28.txt -Dinternal_pcre=true --buildtype debug _build
- meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_android_arm64_28.txt -Dinternal_pcre=true _build
- ninja -C _build
cross-mingw64:
<<: *cross-template
script:
# FIXME: Add --werror
- meson --cross-file=/opt/cross_file_mingw64.txt --buildtype debug _build
- meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_mingw64.txt _build
- ninja -C _build
msys2-mingw32:
......@@ -150,7 +151,7 @@ freebsd-11-x86_64:
# FreeBSD iconv doesn't handle transliteration, so we use GNU libiconv here.
# FreeBSD supports xattr, but its API is different from Linux xattr.
# FIXME: extattr(2) support: https://gitlab.gnome.org/GNOME/glib/issues/1404
- meson -Db_lundef=false -Diconv=gnu -Dxattr=false --buildtype debug _build
- meson ${MESON_COMMON_OPTIONS} -Db_lundef=false -Diconv=gnu -Dxattr=false _build
- ninja -C _build
- meson test -C _build --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}"
# FIXME: Remove this when we have a stable FreeBSD runner
......@@ -191,7 +192,7 @@ dist-job:
only:
- tags
script:
- meson --buildtype release -Dgtk_doc=true -Dman=true _build
- meson --buildtype release --fatal-meson-warnings -Dgtk_doc=true -Dman=true _build
- cd _build
- ninja dist
- ninja glib-doc gobject-doc gio-doc
......
......@@ -52,7 +52,7 @@ RUN rm -rf $ANDROID_NDK_PATH
COPY cross_file_mingw64.txt /opt
RUN pip3 install meson==0.47.0
RUN pip3 install meson==0.48.0
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
......
......@@ -2,7 +2,7 @@
set -e
TAG="registry.gitlab.gnome.org/gnome/glib/master:v7"
TAG="registry.gitlab.gnome.org/gnome/glib/master:v8"
docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .
......
......@@ -5,7 +5,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary
@echo on
:: FIXME: make warnings fatal
pip3 install --upgrade --user meson==0.47.0 || goto :error
pip3 install --upgrade --user meson==0.48.0 || goto :error
meson _build || goto :error
ninja -C _build || goto :error
......
......@@ -33,7 +33,7 @@ mkdir -p _coverage
mkdir -p _ccache
export CCACHE_BASEDIR="$(pwd)"
export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
pip3 install --upgrade --user meson==0.47.0
pip3 install --upgrade --user meson==0.48.0
export PATH="$HOME/.local/bin:$PATH"
export CFLAGS="-coverage -ftest-coverage -fprofile-arcs"
DIR="$(pwd)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment