diff options
| -rw-r--r-- | .gitlab-ci.yml | 39 | ||||
| -rw-r--r-- | .gitlab-ci/ci.template | 11 |
2 files changed, 19 insertions, 31 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 886874cb..e1082bec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,33 +37,22 @@ .templates_sha: &template_sha 0c312d9c7255f46e741d43bcd1930f09cd12efe7 include: - # Alpine container builder template - project: 'freedesktop/ci-templates' ref: *template_sha - file: '/templates/alpine.yml' - # Arch container builder template - - project: 'freedesktop/ci-templates' - ref: *template_sha - file: '/templates/arch.yml' - # Debian container builder template - - project: 'freedesktop/ci-templates' - ref: *template_sha - file: '/templates/debian.yml' - # Fedora container builder template - - project: 'freedesktop/ci-templates' - ref: *template_sha - file: '/templates/fedora.yml' - # Freebsd container builder template - - project: 'freedesktop/ci-templates' - ref: *template_sha - file: '/templates/freebsd.yml' - # Ubuntu container builder template - - project: 'freedesktop/ci-templates' - ref: *template_sha - file: '/templates/ubuntu.yml' - - project: 'freedesktop/ci-templates' - ref: *template_sha - file: '/templates/ci-fairy.yml' + file: + - '/templates/ci-fairy.yml' + # Alpine container builder template + - '/templates/alpine.yml' + # Arch container builder template + - '/templates/arch.yml' + # Debian container builder template + - '/templates/debian.yml' + # Fedora container builder template + - '/templates/fedora.yml' + # Freebsd container builder template + - '/templates/freebsd.yml' + # Ubuntu container builder template + - '/templates/ubuntu.yml' stages: - sanity check # CI/commit checks diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index d5725b9c..80387671 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -39,15 +39,14 @@ .templates_sha: &template_sha 0c312d9c7255f46e741d43bcd1930f09cd12efe7 include: - {% for distro in distributions|sort(attribute="name") %} - # {{ distro.name.capitalize() }} container builder template - project: 'freedesktop/ci-templates' ref: *template_sha - file: '/templates/{{distro.name}}.yml' + file: + - '/templates/ci-fairy.yml' + {% for distro in distributions|sort(attribute="name") %} + # {{ distro.name.capitalize() }} container builder template + - '/templates/{{distro.name}}.yml' {% endfor %} - - project: 'freedesktop/ci-templates' - ref: *template_sha - file: '/templates/ci-fairy.yml' stages: - sanity check # CI/commit checks |