mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2025-12-29 19:30:09 +01:00
gitlab CI: switch to Fedora 31
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
8a75da773e
commit
159dbb8d98
1 changed files with 12 additions and 12 deletions
|
|
@ -22,7 +22,7 @@
|
|||
#
|
||||
# All jobs must follow the naming scheme of
|
||||
# <distribution>:<version>@activity:
|
||||
# e.g. fedora:29@build-default
|
||||
# e.g. fedora:31@build-default
|
||||
|
||||
.templates_sha: &template_sha 5fa4c5aae3775014b99364efc65531037c2e7368 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
||||
|
||||
|
|
@ -62,8 +62,8 @@ variables:
|
|||
# See the documentation here: #
|
||||
# https://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html #
|
||||
###############################################################################
|
||||
FEDORA_RPMS: 'git gcc gcc-c++ pkgconf-pkg-config meson check-devel libudev-devel libevdev-devel doxygen graphviz python3-sphinx python3-recommonmark libwacom-devel cairo-devel gtk3-devel glib2-devel mtdev-devel'
|
||||
FEDORA_QEMU_RPMS: 'git gcc gcc-c++ pkgconf-pkg-config meson check-devel libudev-devel libevdev-devel doxygen graphviz python3-sphinx python3-recommonmark libwacom-devel cairo-devel gtk3-devel glib2-devel mtdev-devel diffutils valgrind'
|
||||
FEDORA_RPMS: 'git gcc gcc-c++ pkgconf-pkg-config meson check-devel libudev-devel libevdev-devel doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx_rtd_theme libwacom-devel cairo-devel gtk3-devel glib2-devel mtdev-devel'
|
||||
FEDORA_QEMU_RPMS: 'git gcc gcc-c++ pkgconf-pkg-config meson check-devel libudev-devel libevdev-devel doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx_rtd_theme libwacom-devel cairo-devel gtk3-devel glib2-devel mtdev-devel diffutils valgrind'
|
||||
UBUNTU_CUSTOM_DEBS: 'git gcc g++ pkg-config meson check libudev-dev libevdev-dev doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx-rtd-theme libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev'
|
||||
ARCH_PKGS: 'git gcc pkgconfig meson check libsystemd libevdev doxygen graphviz python-sphinx python-recommonmark python-sphinx_rtd_theme libwacom gtk3 mtdev diffutils'
|
||||
FREEBSD_BUILD_PKGS: 'meson'
|
||||
|
|
@ -75,12 +75,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: '2019-08-07.0'
|
||||
FEDORA_TAG: '2019-10-25.0'
|
||||
UBUNTU_TAG: '2019-08-07.0'
|
||||
ARCH_TAG: '2019-08-07.0'
|
||||
ALPINE_TAG: '2019-10-15.5'
|
||||
FREEBSD_TAG: '2019-08-07.0'
|
||||
QEMU_TAG: 'qemu-vm-2019-10-04.0'
|
||||
QEMU_TAG: 'qemu-vm-2019-10-25.0'
|
||||
|
||||
UBUNTU_EXEC: "bash .gitlab-ci/ubuntu_install.sh $UBUNTU_CUSTOM_DEBS"
|
||||
|
||||
|
|
@ -176,12 +176,12 @@ fedora:30@container-prep:
|
|||
TAG: $FEDORA_TAG
|
||||
<<: *pull_upstream_or_rebuild
|
||||
|
||||
fedora:29@container-prep:
|
||||
fedora:31@container-prep:
|
||||
extends: .fedora@container-build
|
||||
stage: container_prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FEDORA_VERSION: 29
|
||||
FEDORA_VERSION: 31
|
||||
DISTRIB_FLAVOR: fedora
|
||||
DISTRIB_VERSION: $FEDORA_VERSION
|
||||
TAG: $FEDORA_TAG
|
||||
|
|
@ -351,11 +351,11 @@ fedora:30@container-clean:
|
|||
FEDORA_VERSION: 30
|
||||
CURRENT_CONTAINER_IMAGE: $FEDORA_CONTAINER_IMAGE
|
||||
|
||||
fedora:29@container-clean:
|
||||
fedora:31@container-clean:
|
||||
extends: .container-clean
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FEDORA_VERSION: 29
|
||||
FEDORA_VERSION: 31
|
||||
CURRENT_CONTAINER_IMAGE: $FEDORA_CONTAINER_IMAGE
|
||||
|
||||
ubuntu:18.10@container-clean:
|
||||
|
|
@ -473,12 +473,12 @@ fedora:30@test-suite-vm-valgrind:
|
|||
extends: .build@template
|
||||
image: $FEDORA_CONTAINER_IMAGE
|
||||
|
||||
fedora:29@default-build:
|
||||
fedora:31@default-build:
|
||||
stage: distro
|
||||
extends: .fedora-build@template
|
||||
variables:
|
||||
FEDORA_VERSION: 29
|
||||
needs: ['fedora:29@container-prep']
|
||||
FEDORA_VERSION: 31
|
||||
needs: ['fedora:31@container-prep']
|
||||
|
||||
fedora:30@default-build:
|
||||
stage: distro
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue