Merge branch 'ci-update' into 'main'

ci: Update the Fedora image to Fedora 36

See merge request GNOME/gtk!4730

.gitlab-ci.yml

@@ -25,7 +25,7 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v36"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v38"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
 
 .only-default:

.gitlab-ci/README.md

@@ -14,6 +14,9 @@ Each Docker image has a tag composed of two parts:
 See the [container registry][registry] for the available images for each
 branch, as well as their available versions.
 
+Note that using `latest` as version number will overwrite the most
+recently uploaded image in the registry.
+
 ### Checklist for Updating a CI image
 
  - [ ] Update the `${image}.Dockerfile` file with the dependencies

.gitlab-ci/fedora.Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:34
+FROM fedora:36
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -87,7 +87,6 @@ RUN dnf -y install \
     python3-wheel \
     redhat-rpm-config \
     sassc \
-    systemtap-sdt-devel \
     vulkan-devel \
     wayland-devel \
     wayland-protocols-devel \

testsuite/reftests/meson.build

@@ -482,9 +482,6 @@ testdata = [
   'pseudoclass-on-parent.css',
   'pseudoclass-on-parent.ref.ui',
   'pseudoclass-on-parent.ui',
-  'quit-mnemonic.css',
-  'quit-mnemonic.ref.ui',
-  'quit-mnemonic.ui',
   'repeating-radial-gradient-at-beginning.css',
   'repeating-radial-gradient-at-beginning.ref.ui',
   'repeating-radial-gradient-at-beginning.ui',

testsuite/reftests/quit-mnemonic.css

@@ -1,3 +0,0 @@
-* {
-    padding: 0;
-}

testsuite/reftests/quit-mnemonic.ref.ui

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window1">
-    <property name="decorated">0</property>
-    <child>
-      <object class="GtkLabel" id="label1">
-        <property name="label" translatable="yes">Quit
-</property>
-        <attributes>
-          <attribute name="underline" value="low" start="0" end="1"></attribute>
-        </attributes>
-      </object>
-    </child>
-  </object>
-</interface>

testsuite/reftests/quit-mnemonic.ui

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window1">
-    <property name="decorated">0</property>
-    <child>
-      <object class="GtkGrid" id="grid1">
-        <child>
-          <object class="GtkLabel" id="label1">
-            <property name="label" translatable="yes">Quit</property>
-            <attributes>
-              <attribute name="underline" value="low" start="0" end="1"></attribute>
-            </attributes>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">0</property>
-              <property name="column-span">1</property>
-              <property name="row-span">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label2">
-            <property name="label" translatable="yes"> </property>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">1</property>
-              <property name="column-span">1</property>
-              <property name="row-span">1</property>
-            </layout>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>