diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-24 08:12:35 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-25 17:03:21 +1000 |
| commit | 805421582fa6dad3073c3c6ec309052ed52f47f4 (patch) | |
| tree | 752f235744c951c1eacd952d60aaa1c05da72204 /.gitlab-ci.yml | |
| parent | 134b889724a2e9c94c371b8c96afe50fb013268a (diff) | |
| download | libevdev-805421582fa6dad3073c3c6ec309052ed52f47f4.tar.gz | |
gitlab CI: update to the latest ci-templates again
Unclear what happend but I suspect a rebase went wrong so
e03cdd1d3ff3731eb1432501c48b742e2c6e34ca didn't actually update to the new
ci-templates.
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 cab0b5c..fdfb078 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ # # ######################################## -.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 @@ -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-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' + FEDORA_TAG: '2020-02-25.0' + CENTOS_TAG: '2020-02-25.0' + DEBIAN_TAG: '2020-02-25.0' + UBUNTU_TAG: '2020-02-25.0' + ARCH_TAG: '2020-02-25.0' + ALPINE_TAG: '2020-02-25.0' + QEMU_TAG: 'qemu-2020-02-25.0' UPSTREAM_REPO: libevdev/libevdev BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest @@ -76,7 +76,7 @@ variables: CENTOS_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/centos/$CENTOS_VERSION:$CENTOS_TAG UBUNTU_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$UBUNTU_VERSION:$UBUNTU_TAG DEBIAN_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG - ARCH_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/archlinux/rolling:$ARCH_TAG + ARCH_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/arch/rolling:$ARCH_TAG ALPINE_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/alpine/latest:$ALPINE_TAG QEMU_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FEDORA_VERSION:$QEMU_TAG |