diff options
author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-12-09 07:55:05 +0000 |
---|---|---|
committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-12-09 07:55:05 +0000 |
commit | ee5a93788618d85e4be1b4c96cb8ba3daf0b6173 (patch) | |
tree | 4e40818ef838e1bfd91a06d536b306b900d4b223 | |
parent | 3f118aa426c1bcd47883a7525735ad8023842968 (diff) | |
parent | e1342c0a43abf0e021c636450412cccd11db45b4 (diff) | |
download | gobject-introspection-ee5a93788618d85e4be1b4c96cb8ba3daf0b6173.tar.gz |
Merge branch 'girepo-dep' into 'master'
Creating gir for GIRepository requires girepository library.
See merge request GNOME/gobject-introspection!88
-rw-r--r-- | .gitlab-ci.yml | 1 | ||||
-rw-r--r-- | gir/meson.build | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50e7a4ad..ca61feee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,7 +81,6 @@ msys2-mingw32-autotools: vs2017-x64-meson: stage: build - allow_failure: true tags: - win32 script: diff --git a/gir/meson.build b/gir/meson.build index 338c61ce..f613b0ef 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -402,7 +402,7 @@ endif gir_files += custom_target('gir-girepository', input: girepo_gir_sources, output: 'GIRepository-2.0.gir', - depends: [gobject_gir, giscanner_pymod], + depends: [gobject_gir, giscanner_pymod, girepo_lib], depend_files: giscanner_built_files, install: true, install_dir: girdir, |