Merge branch 'ebassi/ci-image-for-main' into 'main'

Various CI fixes

See merge request GNOME/gtk!5349

.gitlab-ci.yml

@@ -26,7 +26,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:v39"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v40"
   FLATPAK_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
 
 .only-default:
@@ -71,11 +71,6 @@ style-check-diff:
     key: "$CI_JOB_NAME"
     paths:
       - _ccache/
-      - subprojects/gdk-pixbuf/
-      - subprojects/glib/
-      - subprojects/graphene/
-      - subprojects/libepoxy/
-      - subprojects/pango/
 
 fedora-x86_64:
   extends: .build-fedora-default
@@ -159,40 +154,6 @@ fedora-mingw64:
     - ./mingw64-meson.sh -Dintrospection=disabled -Dgraphene:introspection=disabled _build
     - ninja -C _build
 
-installed-tests:
-  extends: .build-fedora-default
-  stage: build
-  needs: []
-  variables:
-    EXTRA_MESON_FLAGS: "-Dinstall-tests=true"
-    G_TEST_ACCESSIBLE: 1
-  script:
-    - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
-    - pip3 install --user meson~=0.64
-    - meson subprojects download
-    - meson subprojects update --reset
-    - meson setup
-        --prefix="${CI_PROJECT_DIR}/_installed"
-        ${COMMON_MESON_FLAGS}
-        ${EXTRA_MESON_FLAGS}
-        ${BACKEND_FLAGS}
-        ${FEATURE_FLAGS}
-        _build
-    - meson compile -C _build
-    - meson install -C _build
-    - export LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64
-    - dbus-run-session xvfb-run -a -s "-screen 0 1024x768x24"
-            gnome-desktop-testing-runner
-                   --report-directory=_build/installed-tests-report/failed/
-                   --parallel=0
-                   --dirs "${CI_PROJECT_DIR}/_installed/share"
-                   gtk-4.0
-  artifacts:
-    paths:
-      - "_build/installed-tests-report/"
-
-
 .mingw-defaults:
   extends: .only-default
   stage: build

.gitlab-ci/fedora.Dockerfile

@@ -18,7 +18,9 @@ RUN dnf -y install \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
     diffutils \
+    docbook-style-xsl \
     elfutils-libelf-devel \
+    expat-devel \
     fribidi-devel \
     gcc \
     gcc-c++ \
@@ -31,6 +33,7 @@ RUN dnf -y install \
     glibc-devel \
     glibc-headers \
     gnome-desktop-testing \
+    gnupg2 \
     gobject-introspection-devel \
     graphene-devel \
     graphviz \
@@ -70,7 +73,6 @@ RUN dnf -y install \
     mesa-dri-drivers \
     mesa-libEGL-devel \
     mesa-libGLES-devel \
-    meson \
     ninja-build \
     pango-devel \
     pcre-devel \
@@ -93,8 +95,6 @@ RUN dnf -y install \
     weston-libs \
     which \
     xorg-x11-server-Xvfb \
- && dnf install -y 'dnf-command(builddep)' \
- && dnf builddep -y wayland \
  && dnf clean all
 
 # Enable sudo for wheel users

testsuite/reftests/meson.build

@@ -608,6 +608,8 @@ flaky = [
   # to be left enabled. Remove it until somebody figures out
   # what is going on there.
   'treeview-headers-hidden.ui',
+  # this consistently times out in the ci
+  'shorthand-entry-border.ui',
 ]
 
 reftest_env = environment()