From dd475309324ea8c83caf736214087d862db451fe Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 16 Nov 2020 13:25:09 +1000 Subject: [PATCH] gitlab CI: add curl to the debian image The coverity job on debian needs curl. Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 16 ++++++++-------- .gitlab-ci/config.yml | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33f00be..c5ad9d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,7 +75,7 @@ variables: # 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' - 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' + 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' @@ -87,13 +87,13 @@ 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: '2020-11-12.1' - DEBIAN_TAG: '2020-11-12.1' - UBUNTU_TAG: '2020-11-12.1' - ARCH_TAG: '2020-11-12.1' - ALPINE_TAG: '2020-11-12.1' - FREEBSD_TAG: '2020-11-12.1' - QEMU_TAG: 'qemu-vm-2020-11-12.1' + FEDORA_TAG: '2020-11-16.0' + DEBIAN_TAG: '2020-11-16.0' + UBUNTU_TAG: '2020-11-16.0' + ARCH_TAG: '2020-11-16.0' + ALPINE_TAG: '2020-11-16.0' + FREEBSD_TAG: '2020-11-16.0' + QEMU_TAG: 'qemu-vm-2020-11-16.0' FREEBSD_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/11.2:$FREEBSD_TAG FDO_UPSTREAM_REPO: libinput/libinput diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index c17f371..8f8dc85 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 '2020-11-12.1' +.default_tag: &default_tag '2020-11-16.0' distributions: - name: fedora @@ -34,7 +34,7 @@ distributions: - glib2-devel - mtdev-devel - diffutils - - valgrind + - valgrind # for the valgrind run, optional - name: debian tag: *default_tag versions: @@ -59,6 +59,7 @@ distributions: - libgtk-3-dev - libglib2.0-dev - libmtdev-dev + - curl # for the coverity job - name: ubuntu tag: *default_tag versions: -- 2.7.4