diff options
| author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2021-07-30 12:05:01 +0200 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2022-09-02 08:39:43 +0200 |
| commit | 46df4f588c3ee54e0f8cbe1f5f16b85423b121e1 (patch) | |
| tree | a263a4605b5d19267fb94fdee6bd6806fba60665 | |
| parent | 1ccbeabb0b5715ae71d35bebf5a29adeda5fd748 (diff) | |
| download | libinput-46df4f588c3ee54e0f8cbe1f5f16b85423b121e1.tar.gz | |
CI: include systemd-udev in the fedora image
This will allow us to have the udevadm tool and systemd-udevd available
while running inside qemu
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | .gitlab-ci/config.yml | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0fd2475b..34272018 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,7 @@ 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 wayland-protocols-devel 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 systemd-udev' 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 wayland-protocols' @@ -88,12 +88,12 @@ 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: '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_TAG: '2022-08-08.0' + DEBIAN_TAG: '2022-08-08.0' + UBUNTU_TAG: '2022-08-08.0' + ARCH_TAG: '2022-08-08.0' + ALPINE_TAG: '2022-08-08.0' + FREEBSD_TAG: '2022-08-08.0' FDO_UPSTREAM_REPO: libinput/libinput diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index d86f9f55..776ec4e0 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -3,7 +3,7 @@ # # We're happy to rebuild all containers when one changes. -.default_tag: &default_tag '2022-06-10.0' +.default_tag: &default_tag '2022-08-08.0' distributions: - name: fedora @@ -36,6 +36,7 @@ distributions: - diffutils - wayland-protocols-devel - valgrind # for the valgrind run, optional + - systemd-udev # for the qemu run, optional - name: debian tag: *default_tag versions: |