[gnome-software/wip/exalm/style-loading] ci: Update images



commit 578e2197477365b458a7842e894e385d5a828848
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Wed Nov 10 16:04:17 2021 +0500

    ci: Update images
    
    Use F35 for Fedora to have GTK 4.4, use newer meson.

 .gitlab-ci.yml                      | 4 ++--
 .gitlab-ci/debian-stable.Dockerfile | 2 +-
 .gitlab-ci/fedora.Dockerfile        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be922ca51..6bb605101 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:v7
+  image: registry.gitlab.gnome.org/gnome/gnome-software/fedora:v8
   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:v7
+  image: registry.gitlab.gnome.org/gnome/gnome-software/debian-stable:v8
   stage: build
   except:
     - tags
diff --git a/.gitlab-ci/debian-stable.Dockerfile b/.gitlab-ci/debian-stable.Dockerfile
index b3d65facb..12325d199 100644
--- a/.gitlab-ci/debian-stable.Dockerfile
+++ b/.gitlab-ci/debian-stable.Dockerfile
@@ -59,7 +59,7 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
     xz-utils \
  && rm -rf /usr/share/doc/* /usr/share/man/*
 
-RUN pip3 install meson==0.55.0
+RUN pip3 install meson==0.60.1
 
 # Enable passwordless sudo for sudo users
 RUN sed -i -e '/%sudo/s/ALL$/NOPASSWD: ALL/' /etc/sudoers
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 3896bf7d9..5f259514f 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:34
+FROM fedora:35
 
 RUN dnf -y install \
     appstream \
@@ -62,7 +62,7 @@ RUN dnf -y install \
     zlib-devel \
  && dnf clean all
 
-RUN pip3 install meson==0.59.1
+RUN pip3 install meson==0.60.1
 
 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers


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