From d9df884fce37516852621a9f651ce44cf16bb5ed Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 19 May 2023 10:54:19 +0200 Subject: [PATCH] gitlab-ci: update to latest ci-templates version --- .gitlab-ci.yml | 14 +++++++------- .gitlab-ci/ci.template | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ac05b5b82..a970a04fdb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ ######################################## -.templates_sha: &template_sha ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha fb33e1b244ec2a0b8edf8ee5590a96369c3b4666 # see https://docs.gitlab.com/ee/ci/yaml/#includefile @@ -56,11 +56,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bumping # ".default_tag". - ALPINE_TAG: 'tag-372c77b49d01' - CENTOS_TAG: 'tag-2b4a70b0543f' - DEBIAN_TAG: 'tag-e7368fd611d6' - FEDORA_TAG: 'tag-2b4a70b0543f' - UBUNTU_TAG: 'tag-e7368fd611d6' + ALPINE_TAG: 'tag-a093d6371bfe' + CENTOS_TAG: 'tag-b353b5cc34d6' + DEBIAN_TAG: 'tag-2d5f18a2ec1a' + FEDORA_TAG: 'tag-b353b5cc34d6' + UBUNTU_TAG: 'tag-2d5f18a2ec1a' ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh' CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh' @@ -829,4 +829,4 @@ triage:issues: workflow: rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - - if: $CI_PIPELINE_SOURCE == 'push' \ No newline at end of file + - if: $CI_PIPELINE_SOURCE == 'push' diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 62d88df84c..b60f21ecdb 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -15,7 +15,7 @@ ######################################## -.templates_sha: &template_sha ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha fb33e1b244ec2a0b8edf8ee5590a96369c3b4666 # see https://docs.gitlab.com/ee/ci/yaml/#includefile {# Group distros by their common (name,) tuples.#} {% set distro_groups = [] %}