luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 09:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Xavier Claessens 2018-09-24 10:19:18 -04:00
parent 686d60d77b
commit 4b983e5122
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci.yml
View File

@ -1,4 +1,4 @@
image: registry.gitlab.gnome.org/gnome/glib/master:v7 image: registry.gitlab.gnome.org/gnome/glib/master:v8
stages: stages:
- build - build
@ -12,6 +12,7 @@ cache:
variables: variables:
MESON_TEST_TIMEOUT_MULTIPLIER: 2 MESON_TEST_TIMEOUT_MULTIPLIER: 2
G_MESSAGES_DEBUG: all G_MESSAGES_DEBUG: all
MESON_COMMON_OPTIONS: "--buildtype debug --fatal-meson-warnings"
fedora-x86_64: fedora-x86_64:
stage: build stage: build
@ -20,7 +21,7 @@ fedora-x86_64:
variables: variables:
CFLAGS: "-coverage -ftest-coverage -fprofile-arcs" CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
script: 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 - ninja -C _build
- mkdir -p _coverage - mkdir -p _coverage
- lcov --rc lcov_branch_coverage=1 --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov" - 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 <<: *cross-template
script: script:
# FIXME: add --werror # 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 - ninja -C _build
cross-android_api28_arm64: cross-android_api28_arm64:
<<: *cross-template <<: *cross-template
script: script:
# FIXME: add --werror # 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 - ninja -C _build
cross-mingw64: cross-mingw64:
<<: *cross-template <<: *cross-template
script: script:
# FIXME: Add --werror # 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 - ninja -C _build
msys2-mingw32: msys2-mingw32:
@ -150,7 +151,7 @@ freebsd-11-x86_64:
# FreeBSD iconv doesn't handle transliteration, so we use GNU libiconv here. # FreeBSD iconv doesn't handle transliteration, so we use GNU libiconv here.
# FreeBSD supports xattr, but its API is different from Linux xattr. # FreeBSD supports xattr, but its API is different from Linux xattr.
# FIXME: extattr(2) support: https://gitlab.gnome.org/GNOME/glib/issues/1404 # 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 - ninja -C _build
- meson test -C _build --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" - meson test -C _build --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}"
# FIXME: Remove this when we have a stable FreeBSD runner # FIXME: Remove this when we have a stable FreeBSD runner
@ -191,7 +192,7 @@ dist-job:
only: only:
- tags - tags
script: script:
- meson --buildtype release -Dgtk_doc=true -Dman=true _build - meson --buildtype release --fatal-meson-warnings -Dgtk_doc=true -Dman=true _build
- cd _build - cd _build
- ninja dist - ninja dist
- ninja glib-doc gobject-doc gio-doc - ninja glib-doc gobject-doc gio-doc

2
.gitlab-ci/Dockerfile
View File

@ -52,7 +52,7 @@ RUN rm -rf $ANDROID_NDK_PATH
COPY cross_file_mingw64.txt /opt 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 ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID} ENV HOST_USER_ID ${HOST_USER_ID}

2
.gitlab-ci/run-docker.sh
View File

@ -2,7 +2,7 @@
set -e 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}" \ docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" . --file "Dockerfile" .

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

@ -5,7 +5,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary
@echo on @echo on
:: FIXME: make warnings fatal :: 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 meson _build || goto :error
ninja -C _build || goto :error ninja -C _build || goto :error

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

@ -33,7 +33,7 @@ mkdir -p _coverage
mkdir -p _ccache mkdir -p _ccache
export CCACHE_BASEDIR="$(pwd)" export CCACHE_BASEDIR="$(pwd)"
export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" 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 PATH="$HOME/.local/bin:$PATH"
export CFLAGS="-coverage -ftest-coverage -fprofile-arcs" export CFLAGS="-coverage -ftest-coverage -fprofile-arcs"
DIR="$(pwd)" DIR="$(pwd)"