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.yml | |
| 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.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16a8f3bb..2b1b9d4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - build - deploy -image: registry.gitlab.gnome.org/gnome/gobject-introspection:v6 +image: registry.gitlab.gnome.org/gnome/gobject-introspection:v7 cache: paths: @@ -36,7 +36,7 @@ fedora-x86_64-meson: - public fedora-x86_64-subprojects: - image: registry.gitlab.gnome.org/gnome/gobject-introspection:min-v1 + image: registry.gitlab.gnome.org/gnome/gobject-introspection:min-v2 stage: build variables: CCACHE_BASEDIR: "${CI_PROJECT_DIR}" |