From 5991023a7ce446ebdf0a1c670afc7641f153ba92 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sun, 22 Mar 2020 11:51:01 +1000 Subject: [PATCH] gitlab CI: invert the ci-templates check This makes the config file simpler, use a variable that is default false but true where we need it. Signed-off-by: Peter Hutterer --- .gitlab-ci/ci.template | 2 +- .gitlab-ci/config.yml | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index ccf158fc..50308fb3 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -37,7 +37,7 @@ include: {% for distro in distributions|sort(attribute="name") %} - {% if distro.ci_templates %} + {% if not distro.does_not_have_ci_templates %} # {{ distro.name.capitalize() }} container builder template - project: 'freedesktop/ci-templates' ref: *template_sha diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index f97b2d5d..6e930f6b 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -13,18 +13,15 @@ distributions: - '31' - '32' want_qemu: true - ci_templates: true - name: ubuntu tag: *default_tag versions: - '19.10' - '19.04' - ci_templates: true - name: arch tag: *default_tag versions: - 'rolling' - ci_templates: true - name: alpine tag: *default_tag versions: @@ -36,10 +33,9 @@ distributions: # for any tcase_add_exit_test/tcase_add_test_raise_signal # but someone more invested in musl will have to figure that out. - "MESON_TEST_ARGS: '' # litest-selftest fails on musl" - ci_templates: true - name: freebsd tag: *default_tag - ci_templates: false + does_not_have_ci_templates: true test_suites: - name: touchpad