[gobject-introspection] build: require meson 0.50.1
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] build: require meson 0.50.1
- Date: Fri, 8 Nov 2019 16:12:18 +0000 (UTC)
commit 2e9f0a4fc9c7f1ba4583eeb76859bbab8cd7c702
Author: Christoph Reiter <reiter christoph gmail com>
Date: Fri Nov 8 16:41:29 2019 +0100
build: require meson 0.50.1
See !186
.gitlab-ci.yml | 2 +-
.gitlab-ci/Dockerfile | 2 +-
.gitlab-ci/run-docker.sh | 2 +-
.gitlab-ci/test-msvc.bat | 2 +-
.gitlab-ci/test-msys2-meson.sh | 2 +-
meson.build | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f28c3b67..9e62b41a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ stages:
- build
- deploy
-image: registry.gitlab.gnome.org/gnome/gobject-introspection:v5
+image: registry.gitlab.gnome.org/gnome/gobject-introspection:v6
cache:
paths:
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 0d9d4268..0dec6700 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -48,7 +48,7 @@ RUN dnf -y install \
zlib-devel \
&& dnf clean all
-RUN pip3 install meson==0.49.2
+RUN pip3 install meson==0.50.1
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 2334edad..5d29002c 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
set -e
-TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v5"
+TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v6"
sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index b30bae5e..a2ee44b2 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -9,7 +9,7 @@ py -3 -c "import urllib.request, sys; urllib.request.urlretrieve(*sys.argv[1:])"
SET PATH=%CD%;%CD%\win_flex_bison;%PATH%
-pip3 install --upgrade --user meson==0.49.2 || goto :error
+pip3 install --upgrade --user meson==0.50.1 || goto :error
meson _build || goto :error
ninja -C _build || goto :error
diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh
index 9c795d33..9f145e5b 100644
--- a/.gitlab-ci/test-msys2-meson.sh
+++ b/.gitlab-ci/test-msys2-meson.sh
@@ -31,7 +31,7 @@ pacman --noconfirm -S --needed \
export CCACHE_BASEDIR="${CI_PROJECT_DIR}"
export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-pip3 install --upgrade --user meson==0.49.2 flake8
+pip3 install --upgrade --user meson==0.50.1 flake8
export PATH="$HOME/.local/bin:$PATH"
export CFLAGS="-Werror"
diff --git a/meson.build b/meson.build
index 6e704776..496813e9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project('gobject-introspection', 'c',
version: '1.63.1',
- meson_version: '>= 0.49.2',
+ meson_version: '>= 0.50.1',
default_options: [
'warning_level=1',
'buildtype=debugoptimized',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]