From 404d4537e0e06c748505a0e5243f737ac9f08d81 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Thu, 28 Nov 2019 17:05:23 +0100 Subject: ci: Build gsettings-desktop-schemas from master We sometimes need new keys from gsettings-desktop-schemas. It is a bit painful to wait for the RPM packages to be updated in fedora rawhide. So instead, just pull in a recent master snapshot into the CI. --- build-aux/ci/Dockerfile.arm64v8.fedora.rawhide | 11 +++++++++-- build-aux/ci/Dockerfile.fedora.rawhide | 11 +++++++++-- build-aux/ci/Dockerfile.ppc64le.fedora.rawhide | 11 +++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) (limited to 'build-aux') diff --git a/build-aux/ci/Dockerfile.arm64v8.fedora.rawhide b/build-aux/ci/Dockerfile.arm64v8.fedora.rawhide index 0d4d5d10..7f57d466 100644 --- a/build-aux/ci/Dockerfile.arm64v8.fedora.rawhide +++ b/build-aux/ci/Dockerfile.arm64v8.fedora.rawhide @@ -17,8 +17,15 @@ RUN dnf -y upgrade && \ libXtst-devel libwacom-devel meson NetworkManager-libnm-devel nss-devel perl-interpreter \ polkit-devel pulseaudio-libs-devel pygobject3 python3-dbusmock upower-devel wayland-devel \ which xorg-x11-drv-wacom-devel xorg-x11-server-Xvfb xorg-x11-utils mutter \ - mesa-dri-drivers umockdev llvm gcr-devel ModemManager-glib-devel && \ - dnf -y clean all + mesa-dri-drivers umockdev llvm gcr-devel ModemManager-glib-devel \ + gobject-introspection-devel && \ + dnf -y clean all && \ + git clone https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git && \ + cd gsettings-desktop-schemas && \ + meson . _build --prefix=/usr && \ + ninja -C _build && \ + ninja -C _build install && \ + cd .. CMD ["/bin/bash"] diff --git a/build-aux/ci/Dockerfile.fedora.rawhide b/build-aux/ci/Dockerfile.fedora.rawhide index d7863cd8..6391604f 100644 --- a/build-aux/ci/Dockerfile.fedora.rawhide +++ b/build-aux/ci/Dockerfile.fedora.rawhide @@ -15,8 +15,15 @@ RUN dnf -y upgrade && \ libXtst-devel libwacom-devel meson NetworkManager-libnm-devel nss-devel perl-interpreter \ polkit-devel pulseaudio-libs-devel pygobject3 python3-dbusmock upower-devel wayland-devel \ which xorg-x11-drv-wacom-devel xorg-x11-server-Xvfb xorg-x11-utils mutter \ - mesa-dri-drivers umockdev llvm gcr-devel ModemManager-glib-devel && \ - dnf -y clean all + mesa-dri-drivers umockdev llvm gcr-devel ModemManager-glib-devel \ + gobject-introspection-devel && \ + dnf -y clean all && \ + git clone https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git && \ + cd gsettings-desktop-schemas && \ + meson . _build --prefix=/usr && \ + ninja -C _build && \ + ninja -C _build install && \ + cd .. CMD ["/bin/bash"] diff --git a/build-aux/ci/Dockerfile.ppc64le.fedora.rawhide b/build-aux/ci/Dockerfile.ppc64le.fedora.rawhide index e4ee7129..206d2905 100644 --- a/build-aux/ci/Dockerfile.ppc64le.fedora.rawhide +++ b/build-aux/ci/Dockerfile.ppc64le.fedora.rawhide @@ -17,8 +17,15 @@ RUN dnf -y upgrade && \ libXtst-devel libwacom-devel meson NetworkManager-libnm-devel nss-devel perl-interpreter \ polkit-devel pulseaudio-libs-devel pygobject3 python3-dbusmock upower-devel wayland-devel \ which xorg-x11-drv-wacom-devel xorg-x11-server-Xvfb xorg-x11-utils mutter \ - mesa-dri-drivers umockdev llvm gcr-devel ModemManager-glib-devel && \ - dnf -y clean all + mesa-dri-drivers umockdev llvm gcr-devel ModemManager-glib-devel \ + gobject-introspection-devel && \ + dnf -y clean all && \ + git clone https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git && \ + cd gsettings-desktop-schemas && \ + meson . _build --prefix=/usr && \ + ninja -C _build && \ + ninja -C _build install && \ + cd .. CMD ["/bin/bash"] -- cgit v1.2.1