[libsoup/wip/ci-test] ci: Update to Fedora Rawide and add sysprof




commit 64207ad9b7c84ecf6cc28687ad1e342e148f8277
Author: Patrick Griffis <pgriffis igalia com>
Date:   Wed Nov 25 12:29:51 2020 -0600

    ci: Update to Fedora Rawide and add sysprof
    
    Rawhide is used instead of 33 for now to avoid building both
    gobject-introspection and vala from source which is needed for
    this dev cycle. GLib master can also be removed very soon.

 .gitlab-ci.yml           | 2 +-
 .gitlab-ci/Dockerfile    | 4 ++--
 .gitlab-ci/run-docker.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02d9c82c..25f54020 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/libsoup/master:v7
+image: registry.gitlab.gnome.org/gnome/libsoup/master:v8
 
 stages:
   - build
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index c3be5666..ae2fb03c 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:rawhide
 
 RUN dnf update -y \
     && dnf install -y 'dnf-command(builddep)' \
@@ -10,7 +10,6 @@ RUN dnf update -y \
                       httpd \
                       lcov \
                       libpsl-devel \
-                      make \
                       meson \
                       mod_ssl \
                       redhat-rpm-config \
@@ -19,6 +18,7 @@ RUN dnf update -y \
                       clang-analyzer \
                       valgrind \
                       libasan \
+                      sysprof-devel \
     && dnf clean all \
     && git clone https://gitlab.gnome.org/GNOME/glib.git \
     && pushd glib \
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 93b6009a..a917a940 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:v7"
+TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v8"
 
 cd "$(dirname "$0")"
 podman build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" --format=docker .


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]