ci: Install build deps for extra modules in Docker image

Rather than bringing build dependencies for gobject-introspection
and xdg-desktop-portal manually, install them in the Docker image.
This commit is contained in:
Bastien Nocera 2019-12-11 17:48:24 +01:00
parent 4aa14d5770
commit 6ff2a181bd
2 changed files with 16 additions and 4 deletions

View File

@ -126,9 +126,6 @@ installed-tests:
image: $FEDORA_IMAGE
stage: build
script:
# FIXME Install xdg-desktop-portal build deps before compiling glib,
# so it doesn't overwrite our own glib build
- sudo dnf install -y autoconf automake gettext-devel libtool diffutils fontconfig-devel json-glib-devel geoclue2-devel pipewire-devel fuse-devel make
# dtrace is disabled because it breaks the static-link.py test
- meson ${MESON_COMMON_OPTIONS}
--werror
@ -151,7 +148,6 @@ installed-tests:
# FIXME install newer gobject-introspection
# with GMemoryMonitor support, see:
# https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/193
- sudo dnf install -y meson flex bison python3-devel
- git clone --single-branch https://gitlab.gnome.org/GNOME/gobject-introspection.git
- cd gobject-introspection
- /usr/bin/meson _build --prefix=/usr --libdir=/usr/lib64

View File

@ -54,6 +54,22 @@ RUN dnf -y install \
xdg-desktop-portal \
xz \
zlib-devel \
&& dnf -y install \
meson \
flex \
bison \
python3-devel \
autoconf \
automake \
gettext-devel \
libtool \
diffutils \
fontconfig-devel \
json-glib-devel \
geoclue2-devel \
pipewire-devel \
fuse-devel \
make \
&& dnf clean all
RUN pip3 install meson==0.52.1