diff options
| author | Philip Withnall <pwithnall@endlessos.org> | 2022-06-07 18:11:32 +0100 |
|---|---|---|
| committer | Philip Withnall <pwithnall@endlessos.org> | 2022-06-16 10:12:07 +0100 |
| commit | b3f49d08a627633d266f31187bff4cce869772d6 (patch) | |
| tree | 817a0cc056d6cdb87e4c3789dccdc7be2972c5b4 /.gitlab-ci | |
| parent | d7c3b0fbf2889d4afd04477b3fd2b8d3e7e00378 (diff) | |
| download | glib-b3f49d08a627633d266f31187bff4cce869772d6.tar.gz | |
build: Move gvdb to a subproject
Rather than carrying the copylib around inside GLib, which is a pain to
synchronise and affects our code coverage statistics.
This requires updating the CI images to cache the new subproject,
including updating the `cache-subprojects.sh` script to pull in git
submodules.
It also requires adding `gioenumtypes_dep` to be added to the
dependencies list of `libgio`, since it needs to be build before GVDB as
it’s pulled in by the GIO headers which GVDB includes.
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
Helps: #2603
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/cache-subprojects.sh | 1 | ||||
| -rw-r--r-- | .gitlab-ci/coverity.Dockerfile | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci/cache-subprojects.sh b/.gitlab-ci/cache-subprojects.sh index fb0b1df82..0e6926605 100755 --- a/.gitlab-ci/cache-subprojects.sh +++ b/.gitlab-ci/cache-subprojects.sh @@ -3,6 +3,7 @@ set -e git clone --depth 1 --no-tags https://gitlab.gnome.org/GNOME/glib.git +git -C glib submodule update --init meson subprojects download --sourcedir glib rm glib/subprojects/*.wrap mv glib/subprojects/ . diff --git a/.gitlab-ci/coverity.Dockerfile b/.gitlab-ci/coverity.Dockerfile index 0a474fc75..67ebc440a 100644 --- a/.gitlab-ci/coverity.Dockerfile +++ b/.gitlab-ci/coverity.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/glib/fedora:v14 +FROM registry.gitlab.gnome.org/gnome/glib/fedora:v16 ARG COVERITY_SCAN_PROJECT_NAME ARG COVERITY_SCAN_TOKEN |