From cc80415a41b1a096f97ec092e615666fbe94c6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Tue, 24 Nov 2020 17:02:13 +0100 Subject: [PATCH] ci: Drop ci-templates-sha anchor As of GitLab 13.6, multiple files can be included for a single ref. Suggested-by: Daniel Stone Part-of: --- .gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 158d6fceba4..bd1eed3d4fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,11 +7,10 @@ variables: include: - project: 'freedesktop/ci-templates' - ref: &ci-templates-sha 52dd4a94044449c8481d18dcdc221a3c636366d2 - file: '/templates/debian.yml' - - project: 'freedesktop/ci-templates' - ref: *ci-templates-sha - file: '/templates/alpine.yml' + ref: 52dd4a94044449c8481d18dcdc221a3c636366d2 + file: + - '/templates/debian.yml' + - '/templates/alpine.yml' - local: '.gitlab-ci/lava-gitlab-ci.yml' - local: '.gitlab-ci/test-source-dep.yml'