[libsoup] ci: Add lcov to docker image
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] ci: Add lcov to docker image
- Date: Wed, 29 Jul 2020 17:06:28 +0000 (UTC)
commit 561cbf21415562072cf90bcd201060927c017c71
Author: Patrick Griffis <pgriffis igalia com>
Date: Wed Jul 29 10:05:55 2020 -0700
ci: Add lcov to docker image
.gitlab-ci.yml | 2 +-
.gitlab-ci/Dockerfile | 11 ++++++-----
.gitlab-ci/run-docker.sh | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e3db83b..3a4312bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/libsoup/master:v4
+image: registry.gitlab.gnome.org/gnome/libsoup/master:v5
.build:
tags:
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index ac83445a..465fad1d 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -3,19 +3,20 @@ FROM fedora:31
RUN dnf update -y \
&& dnf install -y 'dnf-command(builddep)' \
&& dnf builddep -y libsoup \
- && dnf install -y which \
+ && dnf install -y brotli-devel \
git \
gtk-doc \
+ httpd \
+ lcov \
libpsl-devel \
make \
- httpd \
+ meson \
+ mod_ssl \
php \
php-xmlrpc \
- mod_ssl \
redhat-rpm-config \
- meson \
- brotli-devel \
samba-winbind-clients \
+ which \
&& dnf clean all
ARG HOST_USER_ID=5555
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 00931b70..d7d36b2b 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
set -e
-TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v4"
+TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v5"
SUDO_CMD="sudo"
if docker -v |& grep -q podman; then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]