[gnome-software/wip/exalm/libadwaita-beta: 5/5] ci: Update images
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/exalm/libadwaita-beta: 5/5] ci: Update images
- Date: Wed, 8 Dec 2021 11:15:15 +0000 (UTC)
commit 40ec18a56b119d45a99781d6f50e17318c2ef5fe
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Wed Dec 8 16:12:16 2021 +0500
ci: Update images
.gitlab-ci.yml | 4 ++--
.gitlab-ci/debian-stable.Dockerfile | 10 ++++++++++
.gitlab-ci/fedora.Dockerfile | 10 ++++++++++
3 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27ae1d95e..b93f481db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ variables:
fedora-x86_64:
extends: .build
- image: registry.gitlab.gnome.org/gnome/gnome-software/fedora:v8
+ image: registry.gitlab.gnome.org/gnome/gnome-software/fedora:v9
stage: build
except:
- tags
@@ -48,7 +48,7 @@ fedora-x86_64:
debian-stable-x86_64:
extends: .build
- image: registry.gitlab.gnome.org/gnome/gnome-software/debian-stable:v8
+ image: registry.gitlab.gnome.org/gnome/gnome-software/debian-stable:v9
stage: build
except:
- tags
diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile
index 12325d199..e0165fde5 100644
--- a/.gitlab-ci/debian-stable.Dockerfile
+++ b/.gitlab-ci/debian-stable.Dockerfile
@@ -27,8 +27,10 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
libglib2.0-dev \
libglib-testing-0-dev \
libgoa-1.0-dev \
+ libgstreamer-plugins-bad1.0-dev \
libgtk-4-dev \
libgudev-1.0-dev \
+ libjpeg62-turbo-dev \
libjson-glib-dev \
liblmdb-dev \
libmalcontent-0-dev \
@@ -71,6 +73,14 @@ RUN useradd -u $HOST_USER_ID -G sudo -ms /bin/bash user
USER user
WORKDIR /home/user
+RUN git clone https://gitlab.gnome.org/GNOME/gtk.git --depth=1 \
+ && cd gtk \
+ && meson build --prefix=/usr \
+ && ninja -C build \
+ && sudo ninja -C build install \
+ && cd .. \
+ && rm -rf gtk
+
COPY cache-subprojects.sh .
RUN ./cache-subprojects.sh
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 5f259514f..4c7eec348 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -19,6 +19,7 @@ RUN dnf -y install \
gobject-introspection-devel \
gperf \
gsettings-desktop-schemas-devel \
+ gstreamer1-plugins-bad-free-devel \
gtk-doc \
gtk4-devel \
json-glib-devel \
@@ -29,6 +30,7 @@ RUN dnf -y install \
libcurl-devel \
libdnf-devel \
libgudev-devel \
+ libjpeg-turbo-devel \
liboauth-devel \
libsecret-devel \
libsoup-devel \
@@ -74,6 +76,14 @@ RUN useradd -u $HOST_USER_ID -G wheel -ms /bin/bash user
USER user
WORKDIR /home/user
+RUN git clone https://gitlab.gnome.org/GNOME/gtk.git --depth=1 \
+ && cd gtk \
+ && meson build --prefix=/usr \
+ && ninja -C build \
+ && sudo ninja -C build install \
+ && cd .. \
+ && rm -rf gtk
+
COPY cache-subprojects.sh .
RUN ./cache-subprojects.sh
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]