From e48a316c02ab7108ce5afe8101fe7b6a54f81296 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 16 Apr 2020 15:43:42 +1000 Subject: [PATCH] gitlab ci: fix a templating whitespace issue For some reason I'm too tired to investigate, the whitespace in the CI is different than the locally generated one. Alpine must've updated something, I guess. Quickfix it by adjusting the whitespace so it's correct again. Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 1 - .gitlab-ci/ci.template | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 472f557..278af6b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -661,7 +661,6 @@ vm-valgrind-pointer: MESON_TEST_ARGS: '--setup=valgrind' - .fedora-build@template: extends: - .fdo.distribution-image@fedora diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 047b19f..f103d52 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -451,8 +451,7 @@ vm-valgrind-{{suite.name}}: MESON_TEST_ARGS: '--setup=valgrind' {% endfor %} - -{% endfor %} {# for if distro.want_qemu #} +{% endfor %}{# for if distro.want_qemu #} {% for distro in distributions if distro.use_for_custom_build_tests %} {% set version = "{}".format(distro.versions|last()) %} -- 2.7.4