From d3a7e9a7b52d8b5ee426296dd2a67ac9fb893b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 2 Aug 2022 15:50:38 +0200 Subject: [PATCH] ci: Include gcr4 in image Needed in order to port gnome-shell to the new major version (https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2386) Part-of: --- .gitlab-ci.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00d06f1f7..ac05fec5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: .mutter.fedora:35@common: variables: FDO_DISTRIBUTION_VERSION: 35 - BASE_TAG: '2022-07-29.0' + BASE_TAG: '2022-08-02.0' FDO_DISTRIBUTION_PACKAGES: asciidoc clang @@ -35,6 +35,7 @@ variables: qemu-system-x86-core busybox gi-docgen + pkgconfig(libgcrypt) FDO_DISTRIBUTION_EXEC: | dnf install -y 'dnf-command(builddep)' && @@ -68,6 +69,16 @@ variables: https://gitlab.gnome.org/GNOME/gjs.git \ 1.73.1 . && + ./.gitlab-ci/install-meson-project.sh \ + -Dvapi=false \ + -Dgtk3=false \ + -Dgtk4=false \ + -Dgtk_doc=false \ + -Dssh_agent=false \ + -Dsystemd=disabled \ + https://gitlab.gnome.org/GNOME/gcr.git \ + 3.90.0 . && + ./.gitlab-ci/install-meson-project.sh \ https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \ 42.beta . &&