diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-24 19:09:15 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-24 19:46:05 +1000 |
| commit | 5eb53418b32b5e3fcd59390e6c9571e31694bab8 (patch) | |
| tree | 2d022691fbb94491007833776bfa2ccb13b8d86c /.gitlab-ci.yml | |
| parent | 712eb10aad2945d0d4b1784edd6bdb5603745457 (diff) | |
| download | libinput-5eb53418b32b5e3fcd59390e6c9571e31694bab8.tar.gz | |
gitlab CI: update to latest ci-templates
Removes the special distro "flavor" handling for arch and it gives us nicer
warnings for VM failures.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 695fe2cf..3e4870f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ # <distribution>:<version>@activity: # e.g. fedora:31@build-default -.templates_sha: &template_sha b7030c2cd0d6ccc5f6d4f8299bafa4daa9240d71 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 8410d3382c4ba5e83da76a027cb332169f2a95ad # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: # Alpine container builder template @@ -77,12 +77,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-12-12.0' - UBUNTU_TAG: '2019-12-12.0' - ARCH_TAG: '2019-12-12.0' - ALPINE_TAG: '2019-12-12.0' - FREEBSD_TAG: '2019-12-12.0' - QEMU_TAG: 'qemu-vm-2019-12-12.0' + FEDORA_TAG: '2019-12-24.0' + UBUNTU_TAG: '2019-12-24.0' + ARCH_TAG: '2019-12-24.0' + ALPINE_TAG: '2019-12-24.0' + FREEBSD_TAG: '2019-12-24.0' + QEMU_TAG: 'qemu-vm-2020-02-24.0' UBUNTU_EXEC: "bash .gitlab-ci/ubuntu_install.sh $UBUNTU_CUSTOM_DEBS" @@ -90,7 +90,7 @@ variables: BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest FEDORA_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FEDORA_VERSION:$FEDORA_TAG UBUNTU_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$UBUNTU_VERSION:$UBUNTU_TAG - ARCH_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/archlinux/$ARCH_VERSION:$ARCH_TAG + ARCH_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/arch/$ARCH_VERSION:$ARCH_TAG ALPINE_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/alpine/$ALPINE_VERSION:$ALPINE_TAG FREEBSD_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/11.2:$FREEBSD_TAG QEMU_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FEDORA_VERSION:$QEMU_TAG @@ -272,7 +272,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 |