diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-04-22 21:16:08 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2020-04-23 16:32:10 -0400 |
| commit | d01a387475e2665275a6cd6b0059bf91121b8300 (patch) | |
| tree | be0ebaca7c7390e97b340d4b51cd36367bc74ed9 /.gitlab-ci | |
| parent | ec00edd941953626ac027810f747847f68a71000 (diff) | |
| download | gobject-introspection-d01a387475e2665275a6cd6b0059bf91121b8300.tar.gz | |
Meson: Override gobject-introspection-1.0 dependency
When gobject-introspection-1.0 pkg-config is not found on the system,
Meson can fallback to configure g-i as subproject and needs a dependency
object to replace the pc file.
The dependency file needs to ensure that typelibs are created before
compiling any other gir and provide the girdir for files within build
directory. It also need to provide glib dependencies required to compile
girs.
Bump Meson version to 0.54.0 to use meson.override_dependency().
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 2 | ||||
| -rw-r--r-- | .gitlab-ci/minimal.Dockerfile | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker-minimal.sh | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/test-msvc.bat | 2 | ||||
| -rw-r--r-- | .gitlab-ci/test-msys2-meson.sh | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index 0dec6700..61c5fe41 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.50.1 +RUN pip3 install meson==0.54.0 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/minimal.Dockerfile b/.gitlab-ci/minimal.Dockerfile index b33aa64b..e4d1f821 100644 --- a/.gitlab-ci/minimal.Dockerfile +++ b/.gitlab-ci/minimal.Dockerfile @@ -15,7 +15,7 @@ RUN dnf -y install \ libmount-devel \ && dnf clean all -RUN pip3 install meson==0.52.0 +RUN pip3 install meson==0.54.0 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/.gitlab-ci/run-docker-minimal.sh b/.gitlab-ci/run-docker-minimal.sh index 36b2d376..9588f288 100755 --- a/.gitlab-ci/run-docker-minimal.sh +++ b/.gitlab-ci/run-docker-minimal.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:min-v1" +TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:min-v2" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "minimal.Dockerfile" . diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 5d29002c..8e6a04ab 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:v6" +TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v7" 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 a2ee44b2..d8eaa776 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.50.1 || goto :error +pip3 install --upgrade --user meson==0.54.0 || 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 9f145e5b..9c607b29 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.50.1 flake8 +pip3 install --upgrade --user meson==0.54.0 flake8 export PATH="$HOME/.local/bin:$PATH" export CFLAGS="-Werror" |