diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2020-07-29 10:05:55 -0700 |
|---|---|---|
| committer | Patrick Griffis <pgriffis@igalia.com> | 2020-07-29 10:06:10 -0700 |
| commit | 561cbf21415562072cf90bcd201060927c017c71 (patch) | |
| tree | 170105c4c62942e90a42f66edb8270819e931fac /.gitlab-ci | |
| parent | 1369a85a7bbde34dc1c0162ab82c7f5e1d175438 (diff) | |
| download | libsoup-561cbf21415562072cf90bcd201060927c017c71.tar.gz | |
ci: Add lcov to docker image
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 11 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 |
2 files changed, 7 insertions, 6 deletions
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 |