gitlab CI: bump to F35 and F36, as well as Ubuntu 21.10 and 22.04

F33 and F34 are both EOL. This also fixes the RPM build job to
automatically use the latest Fedora version and adds
wayland-protocols-devel which is now needed.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e2be54..e024288 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,10 +87,10 @@ variables:
   # See the documentation here:                                                 #
   # https://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html  #
   ###############################################################################
-  FEDORA_PACKAGES:  'git-core gcc gcc-c++ pkgconf-pkg-config meson check-devel libudev-devel libevdev-devel doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx_rtd_theme python3-pytest-xdist libwacom-devel cairo-devel gtk4-devel glib2-devel mtdev-devel diffutils valgrind'
+  FEDORA_PACKAGES:  'git-core gcc gcc-c++ pkgconf-pkg-config meson check-devel libudev-devel libevdev-devel doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx_rtd_theme python3-pytest-xdist libwacom-devel cairo-devel gtk4-devel glib2-devel mtdev-devel diffutils wayland-protocols-devel valgrind'
   DEBIAN_PACKAGES:  'git gcc g++ pkg-config meson check libudev-dev libevdev-dev doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx-rtd-theme python3-pytest-xdist libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev curl'
   UBUNTU_PACKAGES:  'git gcc g++ pkg-config meson check libudev-dev libevdev-dev doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx-rtd-theme python3-pytest-xdist libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev'
-  ARCH_PACKAGES:    'git gcc pkgconfig meson check libsystemd libevdev doxygen graphviz python-sphinx python-recommonmark python-sphinx_rtd_theme python-pytest-xdist libwacom gtk4 mtdev diffutils'
+  ARCH_PACKAGES:    'git gcc pkgconfig meson check libsystemd libevdev doxygen graphviz python-sphinx python-recommonmark python-sphinx_rtd_theme python-pytest-xdist libwacom gtk4 mtdev diffutils wayland-protocols'
   ALPINE_PACKAGES:  'git gcc build-base pkgconfig meson check-dev eudev-dev libevdev-dev libwacom-dev cairo-dev gtk4.0-dev mtdev-dev bash'
   FREEBSD_PACKAGES: 'git pkgconf meson libepoll-shim libudev-devd libevdev libwacom gtk3 libmtdev bash wayland'
   ############################ end of package lists #############################
@@ -99,14 +99,14 @@ variables:
   # changing these will force rebuilding the associated image
   # Note: these tags have no meaning and are not tied to a particular
   # libinput version
-  FEDORA_TAG:  '2021-07-30.0'
-  DEBIAN_TAG:  '2021-07-30.0'
-  UBUNTU_TAG:  '2021-07-30.0'
-  ARCH_TAG:    '2021-07-30.0'
-  ALPINE_TAG:  '2021-07-30.0'
-  FREEBSD_TAG: '2021-07-30.0'
-  FEDORA_QEMU_TAG:     'fedora-qemu-vm-2021-07-30.0'
-  FREEBSD_QEMU_TAG:    'freebsd-qemu-vm-2021-07-30.0'
+  FEDORA_TAG:  '2022-06-10.0'
+  DEBIAN_TAG:  '2022-06-10.0'
+  UBUNTU_TAG:  '2022-06-10.0'
+  ARCH_TAG:    '2022-06-10.0'
+  ALPINE_TAG:  '2022-06-10.0'
+  FREEBSD_TAG: '2022-06-10.0'
+  FEDORA_QEMU_TAG:     'fedora-qemu-vm-2022-06-10.0'
+  FREEBSD_QEMU_TAG:    'freebsd-qemu-vm-2022-06-10.0'
 
   FDO_UPSTREAM_REPO: libinput/libinput
 
@@ -209,7 +209,7 @@ check-commit:
 # Note: images are rebuilt weekly with a scheduled pipeline with FDO_FORCE_REBUILD set
 #
 #
-fedora:34@qemu-prep:
+fedora:36@qemu-prep:
   extends:
     - .fdo.qemu-build@fedora
     - .policy
@@ -218,7 +218,7 @@ fedora:34@qemu-prep:
     - kvm
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: "34"
+    FDO_DISTRIBUTION_VERSION: "36"
     FDO_DISTRIBUTION_TAG: $FEDORA_QEMU_TAG
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
 
@@ -236,25 +236,25 @@ freebsd:13.0@qemu-prep:
     FDO_DISTRIBUTION_PACKAGES: $FREEBSD_PACKAGES
 
 
-fedora:33@container-prep:
+fedora:35@container-prep:
   extends:
     - .fdo.container-build@fedora
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '33'
+    FDO_DISTRIBUTION_VERSION: '35'
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
-fedora:34@container-prep:
+fedora:36@container-prep:
   extends:
     - .fdo.container-build@fedora
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '34'
+    FDO_DISTRIBUTION_VERSION: '36'
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
@@ -269,25 +269,25 @@ debian:stable@container-prep:
     FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
 
-ubuntu:20.10@container-prep:
+ubuntu:21.10@container-prep:
   extends:
     - .fdo.container-build@ubuntu
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '20.10'
+    FDO_DISTRIBUTION_VERSION: '21.10'
     FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
 
-ubuntu:21.04@container-prep:
+ubuntu:22.04@container-prep:
   extends:
     - .fdo.container-build@ubuntu
     - .policy
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '21.04'
+    FDO_DISTRIBUTION_VERSION: '22.04'
     FDO_DISTRIBUTION_PACKAGES: $UBUNTU_PACKAGES
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
 
@@ -345,24 +345,24 @@ alpine:latest@container-prep:
   only:
     - schedules
 
-fedora:33@container-clean:
+fedora:35@container-clean:
   extends:
     - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '33'
+    FDO_DISTRIBUTION_VERSION: '35'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
-fedora:34@container-clean:
+fedora:36@container-clean:
   extends:
     - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '34'
+    FDO_DISTRIBUTION_VERSION: '36'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
 debian:stable@container-clean:
@@ -375,24 +375,24 @@ debian:stable@container-clean:
     FDO_DISTRIBUTION_VERSION: 'stable'
     FDO_DISTRIBUTION_TAG: $DEBIAN_TAG
 
-ubuntu:20.10@container-clean:
+ubuntu:21.10@container-clean:
   extends:
     - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '20.10'
+    FDO_DISTRIBUTION_VERSION: '21.10'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
 
-ubuntu:21.04@container-clean:
+ubuntu:22.04@container-clean:
   extends:
     - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '21.04'
+    FDO_DISTRIBUTION_VERSION: '22.04'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
 
 arch:rolling@container-clean:
@@ -508,19 +508,19 @@ alpine:latest@container-clean:
     when: script_failure
 
 
-.fedora:34@test-suite-vm:
+.fedora:36@test-suite-vm:
   extends:
     - .test-suite-vm
   variables:
-    FDO_DISTRIBUTION_VERSION: 34
+    FDO_DISTRIBUTION_VERSION: 36
     FDO_DISTRIBUTION_TAG: $FEDORA_QEMU_TAG
   needs:
-    - "fedora:34@qemu-prep"
+    - "fedora:36@qemu-prep"
 
 
 vm-touchpad:
   extends:
-    - .fedora:34@test-suite-vm
+    - .fedora:36@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad'
 
@@ -533,7 +533,7 @@ vm-touchpad-no-libwacom:
 
 vm-tap:
   extends:
-    - .fedora:34@test-suite-vm
+    - .fedora:36@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad-tap'
 
@@ -546,7 +546,7 @@ vm-tap-no-libwacom:
 
 vm-touchpad-buttons:
   extends:
-    - .fedora:34@test-suite-vm
+    - .fedora:36@test-suite-vm
   variables:
     SUITE_NAMES: 'touchpad-buttons'
 
@@ -559,7 +559,7 @@ vm-touchpad-buttons-no-libwacom:
 
 vm-tablet:
   extends:
-    - .fedora:34@test-suite-vm
+    - .fedora:36@test-suite-vm
   variables:
     SUITE_NAMES: 'tablet'
 
@@ -572,7 +572,7 @@ vm-tablet-no-libwacom:
 
 vm-gestures-device:
   extends:
-    - .fedora:34@test-suite-vm
+    - .fedora:36@test-suite-vm
   variables:
     SUITE_NAMES: 'gestures device'
 
@@ -585,7 +585,7 @@ vm-gestures-device-no-libwacom:
 
 vm-backends:
   extends:
-    - .fedora:34@test-suite-vm
+    - .fedora:36@test-suite-vm
   variables:
     SUITE_NAMES: 'path udev'
 
@@ -598,7 +598,7 @@ vm-backends-no-libwacom:
 
 vm-misc:
   extends:
-    - .fedora:34@test-suite-vm
+    - .fedora:36@test-suite-vm
   variables:
     SUITE_NAMES: 'log misc quirks'
 
@@ -611,7 +611,7 @@ vm-misc-no-libwacom:
 
 vm-other devices:
   extends:
-    - .fedora:34@test-suite-vm
+    - .fedora:36@test-suite-vm
   variables:
     SUITE_NAMES: 'keyboard pad switch trackball trackpoint totem touch'
 
@@ -624,7 +624,7 @@ vm-other devices-no-libwacom:
 
 vm-pointer:
   extends:
-    - .fedora:34@test-suite-vm
+    - .fedora:36@test-suite-vm
   variables:
     SUITE_NAMES: 'pointer'
 
@@ -705,12 +705,12 @@ vm-valgrind-pointer:
     - .fdo.distribution-image@fedora
     - .build@template
   variables:
-    FDO_DISTRIBUTION_VERSION: '34'
+    FDO_DISTRIBUTION_VERSION: '36'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:34@container-prep"
+    - "fedora:36@container-prep"
 
-default-build-release@fedora:34:
+default-build-release@fedora:36:
   stage: distro
   extends:
     - .fedora-build@template
@@ -718,7 +718,7 @@ default-build-release@fedora:34:
     MESON_ARGS: "-Dbuildtype=release"
     CFLAGS: "-Werror"
 
-scan-build@fedora:34:
+scan-build@fedora:36:
   extends:
     - .fedora-build@template
   variables:
@@ -737,13 +737,13 @@ scan-build@fedora:34:
 # run them on one image, they shouldn't fail on one distro
 # when they succeed on another.
 
-build-no-libwacom@fedora:34:
+build-no-libwacom@fedora:36:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Dlibwacom=false"
 
-build-no-libwacom-nodeps@fedora:34:
+build-no-libwacom-nodeps@fedora:36:
   extends:
     - .fedora-build@template
   variables:
@@ -751,13 +751,13 @@ build-no-libwacom-nodeps@fedora:34:
   before_script:
     - dnf remove -y libwacom libwacom-devel
 
-build-docs@fedora:34:
+build-docs@fedora:36:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Ddocumentation=true"
 
-build-no-docs-nodeps@fedora:34:
+build-no-docs-nodeps@fedora:36:
   extends:
     - .fedora-build@template
   variables:
@@ -765,13 +765,13 @@ build-no-docs-nodeps@fedora:34:
   before_script:
     - dnf remove -y doxygen graphviz
 
-build-no-debuggui@fedora:34:
+build-no-debuggui@fedora:36:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Ddebug-gui=false"
 
-build-no-debuggui-nodeps@fedora:34:
+build-no-debuggui-nodeps@fedora:36:
   extends:
     - .fedora-build@template
   variables:
@@ -779,13 +779,13 @@ build-no-debuggui-nodeps@fedora:34:
   before_script:
     - dnf remove -y gtk3-devel
 
-build-no-tests@fedora:34:
+build-no-tests@fedora:36:
   extends:
     - .fedora-build@template
   variables:
     MESON_ARGS: "-Dtests=false"
 
-build-no-tests-nodeps@fedora:34:
+build-no-tests-nodeps@fedora:36:
   extends:
     - .fedora-build@template
   variables:
@@ -793,7 +793,7 @@ build-no-tests-nodeps@fedora:34:
   before_script:
     - dnf remove -y check-devel
 
-valgrind@fedora:34:
+valgrind@fedora:36:
   extends:
     - .fedora-build@template
   variables:
@@ -803,7 +803,7 @@ valgrind@fedora:34:
 
 # Python checks, only run on Fedora
 
-usr-bin-env-python@fedora:34:
+usr-bin-env-python@fedora:36:
   extends:
     - .fedora-build@template
   script:
@@ -813,7 +813,7 @@ usr-bin-env-python@fedora:34:
         /bin/false
       fi
 
-python-format@fedora:34:
+python-format@fedora:36:
   extends:
     - .fedora-build@template
   before_script:
@@ -915,28 +915,28 @@ coverity:
 #                                                               #
 #################################################################
 
-fedora:33@default-build:
+fedora:35@default-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '33'
+    FDO_DISTRIBUTION_VERSION: '35'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:33@container-prep"
+    - "fedora:35@container-prep"
 
 
-fedora:34@default-build:
+fedora:36@default-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: '34'
+    FDO_DISTRIBUTION_VERSION: '36'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:34@container-prep"
+    - "fedora:36@container-prep"
 
 
 debian:stable@default-build:
@@ -951,28 +951,28 @@ debian:stable@default-build:
     - "debian:stable@container-prep"
 
 
-ubuntu:20.10@default-build:
+ubuntu:21.10@default-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@ubuntu
   variables:
-    FDO_DISTRIBUTION_VERSION: '20.10'
+    FDO_DISTRIBUTION_VERSION: '21.10'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
   needs:
-    - "ubuntu:20.10@container-prep"
+    - "ubuntu:21.10@container-prep"
 
 
-ubuntu:21.04@default-build:
+ubuntu:22.04@default-build:
   stage: distro
   extends:
     - .build@template
     - .fdo.distribution-image@ubuntu
   variables:
-    FDO_DISTRIBUTION_VERSION: '21.04'
+    FDO_DISTRIBUTION_VERSION: '22.04'
     FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
   needs:
-    - "ubuntu:21.04@container-prep"
+    - "ubuntu:22.04@container-prep"
 
 
 arch:rolling@default-build:
@@ -1044,10 +1044,10 @@ build rpm:
     - .policy
   stage: deploy
   variables:
-    FDO_DISTRIBUTION_VERSION: '34'
+    FDO_DISTRIBUTION_VERSION: '36'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:33@container-prep"
+    - "fedora:36@container-prep"
   script:
     - dnf install -y rpmdevtools jq
     - meson "$MESON_BUILDDIR"

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 9839d6d..61faf67 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -679,16 +679,18 @@ check-merge-request:
       junit: results.xml
   allow_failure: true
 
+{% for distro in distributions if distro.name == "fedora" %}
+{% set version = "{}".format(distro.versions|last()) %}
 build rpm:
   extends:
     - .fdo.distribution-image@fedora
     - .policy
   stage: deploy
   variables:
-    FDO_DISTRIBUTION_VERSION: '34'
+    FDO_DISTRIBUTION_VERSION: '36'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:33@container-prep"
+    - "fedora:36@container-prep"
   script:
     - dnf install -y rpmdevtools jq
     - meson "$MESON_BUILDDIR"
@@ -702,6 +704,7 @@ build rpm:
     - cd "$MESON_BUILDDIR"
     - meson dist --no-test
     - rpmbuild -ta meson-dist/libinput*.tar.xz
+{% endfor %}
 
 
 wayland-web:

diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 6dab81f..f5ddf8e 100644 (file)
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -3,14 +3,14 @@
 #
 
 # We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2021-07-30.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
@@ -35,6 +35,7 @@ distributions:
       - glib2-devel
       - mtdev-devel
       - diffutils
+      - wayland-protocols-devel
       - valgrind        # for the valgrind run, optional
   - name: debian
     tag: *default_tag
@@ -64,8 +65,8 @@ distributions:
   - name: ubuntu
     tag: *default_tag
     versions:
-      - '20.10'
-      - '21.04'
+      - '21.10'
+      - '22.04'
     packages:
       - git
       - gcc
@@ -108,6 +109,7 @@ distributions:
       - gtk4
       - mtdev
       - diffutils
+      - wayland-protocols
   - name: alpine
     tag: *default_tag
     versions: