CI: do not retry the qemu runs

[platform/upstream/libinput.git] / .gitlab-ci / config.yml

diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 3f074c4..4d5b285 100644 (file)
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -3,16 +3,17 @@
 #
 
 # We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2021-05-12.0'
+.default_tag: &default_tag '2022-06-10.0'
 
 distributions:
   - name: fedora
     tag: *default_tag
     versions:
-      - '33'
-      - '34' # last is picked for qemu
+      - '35'
+      - '36' # last is picked for qemu
     want_qemu: true
     use_for_custom_build_tests: true
+    use_for_qemu_tests: true
     packages:
       - git-core
       - gcc
@@ -30,10 +31,11 @@ distributions:
       - python3-pytest-xdist
       - libwacom-devel
       - cairo-devel
-      - gtk3-devel
+      - gtk4-devel
       - glib2-devel
       - mtdev-devel
       - diffutils
+      - wayland-protocols-devel
       - valgrind        # for the valgrind run, optional
   - name: debian
     tag: *default_tag
@@ -63,8 +65,7 @@ distributions:
   - name: ubuntu
     tag: *default_tag
     versions:
-      - '20.10'
-      - '21.04'
+      - '22.04'
     packages:
       - git
       - gcc
@@ -104,9 +105,10 @@ distributions:
       - python-sphinx_rtd_theme
       - python-pytest-xdist
       - libwacom
-      - gtk3
+      - gtk4
       - mtdev
       - diffutils
+      - wayland-protocols
   - name: alpine
     tag: *default_tag
     versions:
@@ -121,7 +123,7 @@ distributions:
       - libevdev-dev
       - libwacom-dev
       - cairo-dev
-      - gtk+3.0-dev
+      - gtk4.0-dev
       - mtdev-dev
       - bash
     build:
@@ -133,14 +135,27 @@ distributions:
         - "MESON_TEST_ARGS: '' # litest-selftest fails on musl"
   - name: freebsd
     tag: *default_tag
+    qemu_based: true
+    versions:
+      - '13.0'
     packages:
+      - git
+      - pkgconf
+      - meson
       - libepoll-shim
       - libudev-devd
       - libevdev
       - libwacom
       - gtk3
       - libmtdev
-    does_not_have_ci_templates: true
+      - bash
+      - wayland
+    build:
+      extra_variables:
+        - "MESON_ARGS: '-Dtests=false -Ddocumentation=false' # doxygen drags down too many deps"
+        # We don't run the tests on FreeBSD, someone would have to fix the
+        # test suite to work on BSD first.
+        - "MESON_TEST_ARGS: '' # test suite doesn't work on BSD yet"
 
 test_suites:
   - name: touchpad