From 94fc9b2200ef4360e7abdce1bcb869e92bc63c6f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 28 Jul 2021 09:00:00 +1000 Subject: [PATCH] gitlab CI: update to latest ci-templates Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 16 ++++++++-------- .gitlab-ci/ci.template | 2 +- .gitlab-ci/config.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be95336..a712ec2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ # :@activity: # e.g. fedora:31@build-default -.templates_sha: &template_sha 18194044f0f984c8815bc9a1a146582f6bf15d41 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 007f3e2fe2235328e77d3cd4ce007ab41cd9ce6c include: # Alpine container builder template @@ -96,13 +96,13 @@ 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: '2021-05-12.0' - DEBIAN_TAG: '2021-05-12.0' - UBUNTU_TAG: '2021-05-12.0' - ARCH_TAG: '2021-05-12.0' - ALPINE_TAG: '2021-05-12.0' - FREEBSD_TAG: '2021-05-12.0' - FEDORA_QEMU_TAG: 'fedora-qemu-vm-2021-05-12.0' + FEDORA_TAG: '2021-07-28.0' + DEBIAN_TAG: '2021-07-28.0' + UBUNTU_TAG: '2021-07-28.0' + ARCH_TAG: '2021-07-28.0' + ALPINE_TAG: '2021-07-28.0' + FREEBSD_TAG: '2021-07-28.0' + FEDORA_QEMU_TAG: 'fedora-qemu-vm-2021-07-28.0' FREEBSD_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/11.2:$FREEBSD_TAG FDO_UPSTREAM_REPO: libinput/libinput diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index f8a781e..85402d9 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -36,7 +36,7 @@ # :@activity: # e.g. fedora:31@build-default -.templates_sha: &template_sha 18194044f0f984c8815bc9a1a146582f6bf15d41 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 007f3e2fe2235328e77d3cd4ce007ab41cd9ce6c include: {% for distro in distributions|sort(attribute="name") %} diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 3f074c4..52adec5 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -3,7 +3,7 @@ # # We're happy to rebuild all containers when one changes. -.default_tag: &default_tag '2021-05-12.0' +.default_tag: &default_tag '2021-07-28.0' distributions: - name: fedora -- 2.7.4