From e03cdd1d3ff3731eb1432501c48b742e2c6e34ca Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 24 Feb 2020 08:12:35 +1000 Subject: [PATCH] gitlab CI: update to latest ci-templates 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 --- .gitlab-ci.yml | 16 ++++++++-------- .gitlab-ci/gitlab-ci-config.yaml | 1 - .gitlab-ci/gitlab-ci.tmpl | 16 ++++++++-------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc90e2c..d3df628 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,13 +62,13 @@ variables: # changing these will force rebuilding the associated image # Note: these tags have no meaning and are not tied to a particular # libevdev version - FEDORA_TAG: '2020-02-20.0' - CENTOS_TAG: '2020-02-17.1' - DEBIAN_TAG: '2020-02-17.1' - UBUNTU_TAG: '2020-02-17.1' - ARCH_TAG: '2020-02-17.1' - ALPINE_TAG: '2020-02-17.1' - QEMU_TAG: 'qemu-2020-02-18.0' + FEDORA_TAG: '2020-02-24.0' + CENTOS_TAG: '2020-02-24.0' + DEBIAN_TAG: '2020-02-24.0' + UBUNTU_TAG: '2020-02-24.0' + ARCH_TAG: '2020-02-24.0' + ALPINE_TAG: '2020-02-24.0' + QEMU_TAG: 'qemu-2020-02-24.0' UPSTREAM_REPO: libevdev/libevdev BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest @@ -317,7 +317,7 @@ arch:rolling@container-prep: variables: GIT_STRATEGY: none ARCH_VERSION: 'rolling' - DISTRIB_FLAVOR: archlinux + DISTRIB_FLAVOR: arch DISTRIB_VERSION: $ARCH_VERSION TAG: $ARCH_TAG diff --git a/.gitlab-ci/gitlab-ci-config.yaml b/.gitlab-ci/gitlab-ci-config.yaml index eab81f3..98900c7 100644 --- a/.gitlab-ci/gitlab-ci-config.yaml +++ b/.gitlab-ci/gitlab-ci-config.yaml @@ -33,6 +33,5 @@ distributions: MAKE_ARGS: "'' # disable distcheck, requires doxygen" - name: arch version: 'rolling' - flavor: 'archlinux' # see https://gitlab.freedesktop.org/wayland/ci-templates/merge_requests/19 - name: alpine version: 'latest' diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl index 489c21c..7dd9f42 100644 --- a/.gitlab-ci/gitlab-ci.tmpl +++ b/.gitlab-ci/gitlab-ci.tmpl @@ -46,13 +46,13 @@ variables: # changing these will force rebuilding the associated image # Note: these tags have no meaning and are not tied to a particular # libevdev version - FEDORA_TAG: '2020-02-20.0' - CENTOS_TAG: '2020-02-17.1' - DEBIAN_TAG: '2020-02-17.1' - UBUNTU_TAG: '2020-02-17.1' - ARCH_TAG: '2020-02-17.1' - ALPINE_TAG: '2020-02-17.1' - QEMU_TAG: 'qemu-2020-02-18.0' + FEDORA_TAG: '2020-02-24.0' + CENTOS_TAG: '2020-02-24.0' + DEBIAN_TAG: '2020-02-24.0' + UBUNTU_TAG: '2020-02-24.0' + ARCH_TAG: '2020-02-24.0' + ALPINE_TAG: '2020-02-24.0' + QEMU_TAG: 'qemu-2020-02-24.0' UPSTREAM_REPO: libevdev/libevdev BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest @@ -190,7 +190,7 @@ fedora:31@qemu-prep: variables: GIT_STRATEGY: none {{ distro.name.upper() }}_VERSION: '{{ distro.version }}' - DISTRIB_FLAVOR: {{ distro.flavor|default(distro.name) }} + DISTRIB_FLAVOR: {{ distro.name }} DISTRIB_VERSION: ${{ distro.name.upper() }}_VERSION TAG: ${{ distro.name.upper() }}_TAG -- 2.34.1