fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2026-05-09 10:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: update to latest ci-templates

Browse source 
This gives us a warning where qemu failed to start and it gets rid of the
different "flavor" that only archlinux had different to the distribution name.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-02-24 08:12:35 +10:00
parent 0e665a2780
commit e03cdd1d3f
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.gitlab-ci.yml
View file

@ -62,13 +62,13 @@ variables:
# changing these will force rebuilding the associated image # changing these will force rebuilding the associated image
# Note: these tags have no meaning and are not tied to a particular # Note: these tags have no meaning and are not tied to a particular
# libevdev version # libevdev version
FEDORA_TAG: '2020-02-20.0' FEDORA_TAG: '2020-02-24.0'
CENTOS_TAG: '2020-02-17.1' CENTOS_TAG: '2020-02-24.0'
DEBIAN_TAG: '2020-02-17.1' DEBIAN_TAG: '2020-02-24.0'
UBUNTU_TAG: '2020-02-17.1' UBUNTU_TAG: '2020-02-24.0'
ARCH_TAG: '2020-02-17.1' ARCH_TAG: '2020-02-24.0'
ALPINE_TAG: '2020-02-17.1' ALPINE_TAG: '2020-02-24.0'
QEMU_TAG: 'qemu-2020-02-18.0' QEMU_TAG: 'qemu-2020-02-24.0'
UPSTREAM_REPO: libevdev/libevdev UPSTREAM_REPO: libevdev/libevdev
BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest
@ -317,7 +317,7 @@ arch:rolling@container-prep:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
ARCH_VERSION: 'rolling' ARCH_VERSION: 'rolling'
DISTRIB_FLAVOR: archlinux DISTRIB_FLAVOR: arch
DISTRIB_VERSION: $ARCH_VERSION DISTRIB_VERSION: $ARCH_VERSION
TAG: $ARCH_TAG TAG: $ARCH_TAG

1
.gitlab-ci/gitlab-ci-config.yaml
View file

@ -33,6 +33,5 @@ distributions:
MAKE_ARGS: "'' # disable distcheck, requires doxygen" MAKE_ARGS: "'' # disable distcheck, requires doxygen"
- name: arch - name: arch
version: 'rolling' version: 'rolling'
flavor: 'archlinux' # see https://gitlab.freedesktop.org/wayland/ci-templates/merge_requests/19
- name: alpine - name: alpine
version: 'latest' version: 'latest'

16
.gitlab-ci/gitlab-ci.tmpl
View file

@ -46,13 +46,13 @@ variables:
# changing these will force rebuilding the associated image # changing these will force rebuilding the associated image
# Note: these tags have no meaning and are not tied to a particular # Note: these tags have no meaning and are not tied to a particular
# libevdev version # libevdev version
FEDORA_TAG: '2020-02-20.0' FEDORA_TAG: '2020-02-24.0'
CENTOS_TAG: '2020-02-17.1' CENTOS_TAG: '2020-02-24.0'
DEBIAN_TAG: '2020-02-17.1' DEBIAN_TAG: '2020-02-24.0'
UBUNTU_TAG: '2020-02-17.1' UBUNTU_TAG: '2020-02-24.0'
ARCH_TAG: '2020-02-17.1' ARCH_TAG: '2020-02-24.0'
ALPINE_TAG: '2020-02-17.1' ALPINE_TAG: '2020-02-24.0'
QEMU_TAG: 'qemu-2020-02-18.0' QEMU_TAG: 'qemu-2020-02-24.0'
UPSTREAM_REPO: libevdev/libevdev UPSTREAM_REPO: libevdev/libevdev
BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest
@ -190,7 +190,7 @@ fedora:31@qemu-prep:
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
{{ distro.name.upper() }}_VERSION: '{{ distro.version }}' {{ distro.name.upper() }}_VERSION: '{{ distro.version }}'
DISTRIB_FLAVOR: {{ distro.flavor|default(distro.name) }} DISTRIB_FLAVOR: {{ distro.name }}
DISTRIB_VERSION: ${{ distro.name.upper() }}_VERSION DISTRIB_VERSION: ${{ distro.name.upper() }}_VERSION
TAG: ${{ distro.name.upper() }}_TAG TAG: ${{ distro.name.upper() }}_TAG