ci: update to GTK 4 when available

Update GTK to version 4 on Fedora, Arch and Alpine Linux.

Not updating Debian and FreeBSD because the package is not available yet
and Ubuntu because it is not available on 20.10.

Signed-off-by: José Expósito <jose.exposito89@gmail.com>
This commit is contained in:
José Expósito 2021-06-16 23:45:58 +02:00
parent be7264f35b
commit 44212baaf1
2 changed files with 15 additions and 15 deletions

View file

@ -87,11 +87,11 @@ 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 gtk3-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 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 gtk3 mtdev diffutils'
ALPINE_PACKAGES: 'git gcc build-base pkgconfig meson check-dev eudev-dev libevdev-dev libwacom-dev cairo-dev gtk+3.0-dev mtdev-dev bash'
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'
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-28.1'
DEBIAN_TAG: '2021-07-28.1'
UBUNTU_TAG: '2021-07-28.1'
ARCH_TAG: '2021-07-28.1'
ALPINE_TAG: '2021-07-28.1'
FREEBSD_TAG: '2021-07-28.1'
FEDORA_QEMU_TAG: 'fedora-qemu-vm-2021-07-28.1'
FREEBSD_QEMU_TAG: 'freebsd-qemu-vm-2021-07-28.1'
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'
FDO_UPSTREAM_REPO: libinput/libinput

View file

@ -3,7 +3,7 @@
#
# We're happy to rebuild all containers when one changes.
.default_tag: &default_tag '2021-07-28.1'
.default_tag: &default_tag '2021-07-30.0'
distributions:
- name: fedora
@ -31,7 +31,7 @@ distributions:
- python3-pytest-xdist
- libwacom-devel
- cairo-devel
- gtk3-devel
- gtk4-devel
- glib2-devel
- mtdev-devel
- diffutils
@ -105,7 +105,7 @@ distributions:
- python-sphinx_rtd_theme
- python-pytest-xdist
- libwacom
- gtk3
- gtk4
- mtdev
- diffutils
- name: alpine
@ -122,7 +122,7 @@ distributions:
- libevdev-dev
- libwacom-dev
- cairo-dev
- gtk+3.0-dev
- gtk4.0-dev
- mtdev-dev
- bash
build: