luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-24 14:36:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: Bump gvdb subproject dependency and disable tests

Browse Source 
This brings in https://gitlab.gnome.org/GNOME/gvdb/-/merge_requests/23,
which is needed for the following few commits.

Unfortunately, one of the other commits it brings in introduces a
sort-of-dependency-loop between GIO and GVDB. To avoid that, we have
to disable the GVDB tests. See
https://gitlab.gnome.org/GNOME/gvdb/-/merge_requests/25 for details.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
This commit is contained in:
Philip Withnall 2024-09-12 15:08:16 +01:00
parent ebdfcf15bf
commit 0134888d50
No known key found for this signature in database
GPG Key ID: DCDF5885B1F3ED73
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -11,11 +11,11 @@ cache:
- _ccache/ - _ccache/
variables: variables:
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v39.2" FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v39.3"
COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7"
DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v20" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v21"
ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v4" ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v5"
MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v39.2" MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v39.3"
GOBJECT_INTROSPECTION_TAG: "1.80.1" GOBJECT_INTROSPECTION_TAG: "1.80.1"
MESON_TEST_TIMEOUT_MULTIPLIER: 4 MESON_TEST_TIMEOUT_MULTIPLIER: 4
G_MESSAGES_DEBUG: all G_MESSAGES_DEBUG: all

2
.gitlab-ci/mingw.Dockerfile
View File

@ -1,4 +1,4 @@
FROM registry.gitlab.gnome.org/gnome/glib/fedora:v39.2 FROM registry.gitlab.gnome.org/gnome/glib/fedora:v39.3
USER root USER root

2
.gitmodules vendored
View File

@ -1,5 +1,5 @@
[submodule "subprojects/gvdb"] [submodule "subprojects/gvdb"]
path = subprojects/gvdb path = subprojects/gvdb
url = ../../GNOME/gvdb.git url = ../../GNOME/gvdb.git
branch = 0854af0fdb6d527a8d1999835ac2c5059976c210 branch = 2b42fc75f09dbe1cd1057580b5782b08f2dcb400
shallow = true shallow = true

2
meson.build
View File

@ -2239,7 +2239,7 @@ else
endif endif
# Import the gvdb sources as a subproject to avoid having the copylib in-tree # Import the gvdb sources as a subproject to avoid having the copylib in-tree
subproject('gvdb') subproject('gvdb', default_options: {'tests': false})
gvdb_dep = dependency('gvdb') gvdb_dep = dependency('gvdb')
libm = cc.find_library('m', required : false) libm = cc.find_library('m', required : false)

2
subprojects/gvdb

@ -1 +1 @@
Subproject commit 0854af0fdb6d527a8d1999835ac2c5059976c210 Subproject commit 2b42fc75f09dbe1cd1057580b5782b08f2dcb400

2
subprojects/gvdb.wrap
View File

@ -1,7 +1,7 @@
[wrap-git] [wrap-git]
directory=gvdb directory=gvdb
url=https://gitlab.gnome.org/GNOME/gvdb.git url=https://gitlab.gnome.org/GNOME/gvdb.git
revision=0854af0fdb6d527a8d1999835ac2c5059976c210 revision=2b42fc75f09dbe1cd1057580b5782b08f2dcb400
depth=1 depth=1
[provide] [provide]