From e6d0229b2251751d7f169d61a86d9526bab9eb7e Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 11 Jan 2024 15:13:07 +0000 Subject: [PATCH 1/2] subprojects: Update the wrap file for gi-docgen Use the [provide] section to override the binary name, and track the main development branch, like GTK does, so we get warnings and a consistent output. --- subprojects/gi-docgen.wrap | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/subprojects/gi-docgen.wrap b/subprojects/gi-docgen.wrap index 022c7ac34..b156555ac 100644 --- a/subprojects/gi-docgen.wrap +++ b/subprojects/gi-docgen.wrap @@ -1,5 +1,9 @@ [wrap-git] -directory=gi-docgen -url=https://gitlab.gnome.org/GNOME/gi-docgen.git -revision=2023.1 -depth=1 +directory = gi-docgen +url = https://gitlab.gnome.org/GNOME/gi-docgen.git +push-url = ssh://git@ssh.gitlab.gnome.org:GNOME/gi-docgen.git +revision = 2024.1 +depth = 1 + +[provide] +program_names = gi-docgen From efab4c1c7166082bc8513dbf462e1d799afe8b03 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 14 Jun 2024 13:59:01 +0100 Subject: [PATCH 2/2] build: Bump the gi-docgen dependency to 2024.1 This gives us an updated enumeration template and link validation, amongst other things. Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 8 ++++---- .gitlab-ci/mingw.Dockerfile | 2 +- docs/reference/meson.build | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b7278456..ac9fcc7a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,11 +11,11 @@ cache: - _ccache/ variables: - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v39.4" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v39.5" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7" - DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v22" - ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v6" - MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v39.4" + DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v23" + ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v7" + MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v39.5" GOBJECT_INTROSPECTION_TAG: "1.80.1" MESON_TEST_TIMEOUT_MULTIPLIER: 4 G_MESSAGES_DEBUG: all diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile index 0269c201c..7fef21e5e 100644 --- a/.gitlab-ci/mingw.Dockerfile +++ b/.gitlab-ci/mingw.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.gnome.org/gnome/glib/fedora:v39.4 +FROM registry.gitlab.gnome.org/gnome/glib/fedora:v39.5 USER root diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 65eb83a9e..699504b0a 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -1,5 +1,5 @@ if get_option('documentation') and enable_gir - gidocgen_dep = dependency('gi-docgen', version: '>= 2023.1', + gidocgen_dep = dependency('gi-docgen', version: '>= 2024.1', fallback: ['gi-docgen', 'dummy_dep'], native: true, required: true)