[gtksourceview/wip/chergert/bump-ci] .gitlab-ci.yml: bump fedora image




commit 6a1c4775c1795c0adf71229963ea642088e54b6f
Author: Christian Hergert <chergert redhat com>
Date:   Sat May 14 13:01:41 2022 -0700

    .gitlab-ci.yml: bump fedora image
    
    Following 
https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4730/diffs?commit_id=aa9a8702e4c862a934d3095f8676dc34afe54da4
    
    Also enable sysprof so we get any warnings from that.

 .gitlab-ci.yml               | 4 ++--
 .gitlab-ci/fedora.Dockerfile | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8fe93a6..3e778f1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
     - deploy
 
 variables:
-    FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtksourceview/fedora:latest"
+    FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v38"
 
 flatpak:
     image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
@@ -25,7 +25,7 @@ reference:
     stage: docs
     needs: []
     variables:
-        MESON_FLAGS: "-Dwerror=true --buildtype=release -Dgtk:media-gstreamer=disabled 
-Dgtk:broadway-backend=false -Dgtk:demos=false -Dgtk:build-examples=false -Dgtk:build-tests=false 
-Dgtk:werror=false -Dlibsass:werror=false -Dsassc:werror=false -Dlibadwaita:werror=false"
+        MESON_FLAGS: "-Dwerror=true --buildtype=release -Dsysprof=true -Dgtk:media-gstreamer=disabled 
-Dgtk:broadway-backend=false -Dgtk:demos=false -Dgtk:build-examples=false -Dgtk:build-tests=false 
-Dgtk:werror=false -Dlibsass:werror=false -Dsassc:werror=false -Dlibadwaita:werror=false"
     script:
         - sudo dnf -y install git libpng-devel libjpeg-turbo-devel expat-devel
         - mkdir -p pfx/
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 29cdaf03..26c4ab9d 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,16 +1,20 @@
-FROM fedora:35
+FROM fedora:36
 
 RUN dnf update -y
 RUN dnf -y install \
     meson \
     vala \
+    libvala-devel \
     gtk4-devel \
     ninja-build \
     pkgconf \
     clang \
     gobject-introspection-devel \
     vulkan-headers \
-    python3-pip
+    python3-pip \
+    wayland-devel \
+    wayland-protocols-devel \
+    sysprof-devel
 
 RUN dnf clean all
 


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