diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-04 14:41:03 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-04 14:41:33 +1000 |
| commit | 09fd1f4e66a1575002805ce93871c579927f8643 (patch) | |
| tree | 052ce59b000d3a64df0e8cc9f0aaa75b6ee1c255 | |
| parent | 7820dc8b087be9b3de95e3755b32007373ecbbac (diff) | |
| download | libevdev-09fd1f4e66a1575002805ce93871c579927f8643.tar.gz | |
gitlab CI: prettify the include of templates
Identical to libinput commit c8c825289f1b7575ee10b849c04f5caa60483a7e by
Benjamin Tissoires.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | .gitlab-ci.yml | 29 | ||||
| -rw-r--r-- | .gitlab-ci/ci.template | 7 |
2 files changed, 15 insertions, 21 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8853a7..bd0e9c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,26 +7,19 @@ .templates_sha: &template_sha 0c312d9c7255f46e741d43bcd1930f09cd12efe7 # see https://docs.gitlab.com/ee/ci/yaml/#includefile 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' - # Ubuntu container builder template - - project: 'freedesktop/ci-templates' - ref: *template_sha - file: '/templates/ubuntu.yml' + file: + # 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' + # Ubuntu container builder template + - '/templates/ubuntu.yml' stages: - prep # rebuild the container images if there is a change diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index fa0a91c..c3e854b 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -9,11 +9,12 @@ .templates_sha: &template_sha 0c312d9c7255f46e741d43bcd1930f09cd12efe7 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: - {% for distribution in distributions|map(attribute='name')|unique()|sort() %} - # {{ distribution.capitalize() }} container builder template - project: 'freedesktop/ci-templates' ref: *template_sha - file: '/templates/{{distribution}}.yml' + file: + {% for distribution in distributions|map(attribute='name')|unique()|sort() %} + # {{ distribution.capitalize() }} container builder template + - '/templates/{{distribution}}.yml' {% endfor %} stages: |